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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c
          +++ new/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c
↓ open down ↓ 3623 lines elided ↑ open up ↑
3624 3624                  if (picldevtree_debug > 1)
3625 3625                          syslog(LOG_INFO, "picldevtree: event handler done\n");
3626 3626                  return;
3627 3627          }
3628 3628  
3629 3629          nvlp = NULL;
3630 3630          if (nvlist_unpack((char *)earg, size, &nvlp, NULL) ||
3631 3631              nvlist_lookup_string(nvlp, PICLEVENTARG_DEVFS_PATH, &devfs_path) ||
3632 3632              strlen(devfs_path) > (PATH_MAX - sizeof (PLATFORM_PATH))) {
3633 3633                  syslog(LOG_INFO, PICL_EVENT_DROPPED, ename);
3634      -                if (nvlp)
3635      -                        nvlist_free(nvlp);
     3634 +                nvlist_free(nvlp);
3636 3635                  return;
3637 3636          }
3638 3637  
3639 3638          (void) strlcpy(ptreepath, PLATFORM_PATH, PATH_MAX);
3640 3639          (void) strlcat(ptreepath, devfs_path, PATH_MAX);
3641 3640          (void) strlcpy(dipath, devfs_path, PATH_MAX);
3642 3641          nvlist_free(nvlp);
3643 3642  
3644 3643          if (picldevtree_debug)
3645 3644                  syslog(LOG_INFO, "picldevtree: event handler invoked ename:%s "
↓ open down ↓ 146 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX