svn commit: r252158 - stable/9/sbin/ifconfig

Gleb Smirnoff glebius at FreeBSD.org
Mon Jun 24 09:55:38 UTC 2013


Author: glebius
Date: Mon Jun 24 09:55:37 2013
New Revision: 252158
URL: http://svnweb.freebsd.org/changeset/base/252158

Log:
  Merge r249897:
    Don't free memory that is going to be used as error string.
  
    PR:           bin/178121
    Submitted by: Garrett Cooper <yaneurabeya gmail.com>

Modified:
  stable/9/sbin/ifconfig/iflagg.c
Directory Properties:
  stable/9/sbin/ifconfig/   (props changed)

Modified: stable/9/sbin/ifconfig/iflagg.c
==============================================================================
--- stable/9/sbin/ifconfig/iflagg.c	Mon Jun 24 09:53:43 2013	(r252157)
+++ stable/9/sbin/ifconfig/iflagg.c	Mon Jun 24 09:55:37 2013	(r252158)
@@ -98,10 +98,8 @@ setlagghash(const char *val, int d, int 
 			rf.rf_flags |= LAGG_F_HASHL3;
 		else if (strcmp(tok, "l4") == 0)
 			rf.rf_flags |= LAGG_F_HASHL4;
-		else  {
-			free(str);
+		else
 			errx(1, "Invalid lagghash option: %s", tok);
-		}
 	}
 	free(str);
 	if (rf.rf_flags == 0)


More information about the svn-src-stable mailing list