Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/common/nvpair/nvpair.c
          +++ new/usr/src/common/nvpair/nvpair.c
↓ open down ↓ 532 lines elided ↑ open up ↑
 533  533  {
 534  534          switch (NVP_TYPE(nvp)) {
 535  535          case DATA_TYPE_NVLIST:
 536  536                  nvlist_free(EMBEDDED_NVL(nvp));
 537  537                  break;
 538  538          case DATA_TYPE_NVLIST_ARRAY: {
 539  539                  nvlist_t **nvlp = EMBEDDED_NVL_ARRAY(nvp);
 540  540                  int i;
 541  541  
 542  542                  for (i = 0; i < NVP_NELEM(nvp); i++)
 543      -                        if (nvlp[i] != NULL)
 544      -                                nvlist_free(nvlp[i]);
      543 +                        nvlist_free(nvlp[i]);
 545  544                  break;
 546  545          }
 547  546          default:
 548  547                  break;
 549  548          }
 550  549  }
 551  550  
 552  551  /*
 553  552   * nvlist_free - free an unpacked nvlist
 554  553   */
↓ open down ↓ 2746 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX