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

*** 1699,1709 **** matched++; out(O_ALTFP|O_NONL, "["); ipath_print(O_ALTFP|O_NONL, eventstring, ipp); out(O_ALTFP, " explained by FME%d]", fmep->id); - if (pre_peek_nvp) nvlist_free(pre_peek_nvp); if (ep->count == 1) serialize_observation(fmep, eventstring, ipp); --- 1699,1708 ----
*** 2026,2044 **** } err = nvlist_add_nvlist_array(f, FM_FMRI_HC_LIST, pa, depth); if (err == 0) { for (i = 0; i < depth; i++) - if (pa[i] != NULL) nvlist_free(pa[i]); return (f); } failure = "addition of hc-pair array to FMRI failed"; boom: for (i = 0; i < depth; i++) - if (pa[i] != NULL) nvlist_free(pa[i]); nvlist_free(f); out(O_DIE, "%s", failure); /*NOTREACHED*/ return (NULL); --- 2025,2041 ----
*** 2099,2117 **** } err = nvlist_add_nvlist_array(f, FM_FMRI_HC_LIST, pa, depth); if (err == 0) { for (i = 0; i < depth; i++) - if (pa[i] != NULL) nvlist_free(pa[i]); return (f); } failure = "addition of hc-pair array to FMRI failed"; boom: for (i = 0; i < depth; i++) - if (pa[i] != NULL) nvlist_free(pa[i]); nvlist_free(f); out(O_DIE, "%s", failure); /*NOTREACHED*/ return (NULL); --- 2096,2112 ----
*** 2139,2153 **** * freed elsewhere. */ static void rslfree(struct rsl *freeme) { - if (freeme->asru != NULL) nvlist_free(freeme->asru); - if (freeme->fru != NULL) nvlist_free(freeme->fru); ! if (freeme->rsrc != NULL && freeme->rsrc != freeme->asru) nvlist_free(freeme->rsrc); } /* * rslcmp -- compare two rsl structures. Use the following --- 2134,2146 ---- * freed elsewhere. */ static void rslfree(struct rsl *freeme) { nvlist_free(freeme->asru); nvlist_free(freeme->fru); ! if (freeme->rsrc != freeme->asru) nvlist_free(freeme->rsrc); } /* * rslcmp -- compare two rsl structures. Use the following