From: Ulrich Drepper <drepper@gmail.com>
Date: Mon, 30 Jun 2014 10:58:52 +0000 (-0400)
Subject: 	lexsup.c (parse_args): Check whether provided SONAME is empty
X-Git-Tag: binutils-2_25~923
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b00548197542a46df0e46d848ac61a00827943ea;p=external%2Fbinutils.git

	lexsup.c (parse_args): Check whether provided SONAME is empty
	string.  If yes, warn and ignore it.  Don't overwrite valid SONAME
	with empty string.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f42d00b..a903fc0 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-30  Ulrich Drepper  <drepper@gmail.com>
+
+	* lexsup.c (parse_args): Check whether provided SONAME is empty
+	string.  If yes, warn and ignore it.  Don't overwrite valid SONAME
+	with empty string.
+
 2014-06-26  Linda Zhang  <lindasc@qq.com>
 
 	* emultempl/pe.em: Initialise insert_timestamp to true.
diff --git a/ld/lexsup.c b/ld/lexsup.c
index a8c57d2..52b4fdb 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1107,7 +1107,11 @@ parse_args (unsigned argc, char **argv)
 	  break;
 	case 'h':		/* Used on Solaris.  */
 	case OPTION_SONAME:
-	  command_line.soname = optarg;
+	  if (optarg[0] == '\0' && command_line.soname
+	      && command_line.soname[0])
+	    einfo (_("%P: SONAME must not be empty string; keeping previous one\n"));
+	  else
+	    command_line.soname = optarg;
 	  break;
 	case OPTION_SORT_COMMON:
 	  if (optarg == NULL
@@ -1443,6 +1447,12 @@ parse_args (unsigned argc, char **argv)
 	}
     }
 
+  if (command_line.soname && command_line.soname[0] == '\0')
+    {
+      einfo (_("%P: SONAME must not be empty string; ignored\n"));
+      command_line.soname = NULL;
+    }
+
   while (ingroup)
     {
       lang_leave_group ();