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

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/fm/topo/libtopo/common/topo_xml.c
          +++ new/usr/src/lib/fm/topo/libtopo/common/topo_xml.c
↓ open down ↓ 1004 lines elided ↑ open up ↑
1005 1005                                  goto pmr_done;
1006 1006                          }
1007 1007                  }
1008 1008          }
1009 1009  
1010 1010  pmr_done:
1011 1011          if (meth_name)
1012 1012                  xmlFree(meth_name);
1013 1013          if (prop_name)
1014 1014                  xmlFree(prop_name);
1015      -        if (arg_nvl)
1016      -                nvlist_free(arg_nvl);
     1015 +        nvlist_free(arg_nvl);
1017 1016          return (ret);
1018 1017  }
1019 1018  
1020 1019  
1021 1020  static int
1022 1021  pgroup_record(topo_mod_t *mp, xmlNodePtr pxn, tnode_t *tn, const char *rname,
1023 1022      tf_pad_t *rpad, int pi, const char *ppgrp_name)
1024 1023  {
1025 1024          topo_stability_t nmstab, dstab;
1026 1025          uint64_t ver;
↓ open down ↓ 68 lines elided ↑ open up ↑
1095 1094                              ppgrp_name) < 0)
1096 1095                                  break;
1097 1096                  }
1098 1097          }
1099 1098          xmlFree(name);
1100 1099          if (pcnt > 0) {
1101 1100                  e |= (ai != pcnt);
1102 1101                  e |= nvlist_add_nvlist_array(pgnvl, INV_PGRP_ALLPROPS, apl,
1103 1102                      pcnt);
1104 1103                  for (ai = 0; ai < pcnt; ai++)
1105      -                        if (apl[ai] != NULL)
1106      -                                nvlist_free(apl[ai]);
     1104 +                        nvlist_free(apl[ai]);
1107 1105                  topo_mod_free(mp, apl, pcnt * sizeof (nvlist_t *));
1108 1106                  if (e != 0) {
1109 1107                          nvlist_free(pgnvl);
1110 1108                          return (-1);
1111 1109                  }
1112 1110          }
1113 1111          rpad->tpad_pgs[pi] = pgnvl;
1114 1112          return (0);
1115 1113  }
1116 1114  
↓ open down ↓ 1021 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX