[gentoo-commits] gentoo-projects commit in pax-utils: scanelf.c

["Fabian Groffen (grobian)" <grobian@gentoo.org>]

grobian     08/12/10 20:06:20

  Modified:             scanelf.c
  Log:
  undo accidential 'fix'

Revision  Changes    Path
1.200                pax-utils/scanelf.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?rev=1.200&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?rev=1.200&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?r1=1.199&r2=1.200

Index: scanelf.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- scanelf.c	10 Dec 2008 20:05:20 -0000	1.199
+++ scanelf.c	10 Dec 2008 20:06:20 -0000	1.200
@@ -1,13 +1,13 @@
 /*
  * Copyright 2003-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.199 2008/12/10 20:05:20 grobian Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.200 2008/12/10 20:06:20 grobian Exp $
  *
  * Copyright 2003-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2004-2007 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-static const char *rcsid = "$Id: scanelf.c,v 1.199 2008/12/10 20:05:20 grobian Exp $";
+static const char *rcsid = "$Id: scanelf.c,v 1.200 2008/12/10 20:06:20 grobian Exp $";
 const char * const argv0 = "scanelf";
 
 #include "paxinc.h"
@@ -1039,7 +1039,7 @@
 					while (next_sym) { \
 						this_sym = next_sym; \
 						if ((next_sym = strchr(this_sym, ','))) \
-							*next_sym++ = '\0'; /* Skip the comma */ \
+							next_sym += 1; /* Skip the comma */ \
 						/* do we want a defined symbol ? */ \
 						if (*this_sym == '+') { \
 							if (sym->st_shndx == SHN_UNDEF) \
@@ -1051,6 +1051,8 @@
 								continue; \
 							++this_sym; \
 						} \
+						if (next_sym) /* Copy it so that we don't have to worry about the final , */ \
+							this_sym = strndup(this_sym, next_sym-this_sym); \
 						/* ok, lets compare the name now */ \
 						if (scanelf_match_symname(this_sym, symname)) { \
 							if (be_semi_verbose) { \
@@ -1063,6 +1065,7 @@
 							(*found_sym)++; \
 							goto break_out; \
 						} \
+						if (next_sym) free(this_sym); \
 					} \
 				} \
 			} \