Author: rrs
Date: Tue Jan 27 18:56:22 2015
New Revision: 277800
URL: https://svnweb.freebsd.org/changeset/base/277800

Log:
  Fix yet another coverty warning (missing io is NULL check) and in examining 
that
  warning I see yet another issue where we should be pclosing the io in the 
event
  of the error and its a command (not fclose only).

Modified:
  head/usr.sbin/pmcstudy/pmcstudy.c

Modified: head/usr.sbin/pmcstudy/pmcstudy.c
==============================================================================
--- head/usr.sbin/pmcstudy/pmcstudy.c   Tue Jan 27 18:27:07 2015        
(r277799)
+++ head/usr.sbin/pmcstudy/pmcstudy.c   Tue Jan 27 18:56:22 2015        
(r277800)
@@ -1796,6 +1796,10 @@ process_file(char *filename)
 
        if (filename ==  NULL) {
                io = my_popen(command, "r", &pid_of_command);
+               if (io == NULL) {
+                       printf("Can't popen the command %s\n", command);
+                       return;
+               }
        } else {
                io = fopen(filename, "r");
                if (io == NULL) {
@@ -1808,8 +1812,10 @@ process_file(char *filename)
        if (cnts == NULL) {
                /* Nothing we can do */
                printf("Nothing to do -- no counters built\n");
-               if (io) {
-                       fclose(io);
+               if (filename) {
+                       fclose(io); 
+               } else {
+                       my_pclose(io, pid_of_command);
                }
                return;
        }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to