Print this page
6659 nvlist_free(NULL) is a no-op

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libzfs/common/libzfs_import.c
          +++ new/usr/src/lib/libzfs/common/libzfs_import.c
↓ open down ↓ 1274 lines elided ↑ open up ↑
1275 1275  
1276 1276          ret = get_configs(hdl, &pools, iarg->can_be_active);
1277 1277  
1278 1278  error:
1279 1279          for (pe = pools.pools; pe != NULL; pe = penext) {
1280 1280                  penext = pe->pe_next;
1281 1281                  for (ve = pe->pe_vdevs; ve != NULL; ve = venext) {
1282 1282                          venext = ve->ve_next;
1283 1283                          for (ce = ve->ve_configs; ce != NULL; ce = cenext) {
1284 1284                                  cenext = ce->ce_next;
1285      -                                if (ce->ce_config)
1286      -                                        nvlist_free(ce->ce_config);
     1285 +                                nvlist_free(ce->ce_config);
1287 1286                                  free(ce);
1288 1287                          }
1289 1288                          free(ve);
1290 1289                  }
1291 1290                  free(pe);
1292 1291          }
1293 1292  
1294 1293          for (ne = pools.names; ne != NULL; ne = nenext) {
1295 1294                  nenext = ne->ne_next;
1296 1295                  free(ne->ne_name);
↓ open down ↓ 404 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX