From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 1 Feb 2008 23:52:59 +0000 (+0000)
Subject: Minor optimization in parameter substituion loop in ld.
X-Git-Tag: elfutils-0.133~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd1bf7b762f0b7d3b1158e52c800d299ed5333f;p=thirdparty%2Felfutils.git

Minor optimization in parameter substituion loop in ld.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 06b297811..a532a98e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-02-01  Ulrich Drepper  <drepper@redhat.com>
 
+	* ld.c (replace_args): Prevent loop over replacements if the parameter
+	is only two characters long.
+
 	* ld.c: Recognize sha1 argument for --build-id parameter.
 	* ldgeneric.c (create_build_id_section): Handle sha1.
 	(compute_hash_sum): New function.  Broken out of compute_build_id.
diff --git a/src/ld.c b/src/ld.c
index a863478a8..11c5cabd0 100644
--- a/src/ld.c
+++ b/src/ld.c
@@ -512,7 +512,7 @@ replace_args (int argc, char *argv[])
   const size_t nargs = sizeof (args) / sizeof (args[0]);
 
   for (int i = 1; i < argc; ++i)
-    if (argv[i][0] == '-' && islower (argv[i][1]))
+    if (argv[i][0] == '-' && islower (argv[i][1]) && argv[i][2] != '\0')
       for (size_t j = 0; j < nargs; ++j)
 	if (strcmp (argv[i], args[j].from) == 0)
 	  {