Patchwork Fix PR50293 - LTO plugin with space in path

login
register
mail settings
Submitter Joey Ye
Date March 4, 2013, 8:10 a.m.
Message ID <000101ce18af$c9e89750$5db9c5f0$@ye@arm.com>
Download mbox | patch
Permalink /patch/224634/
State New
Headers show

Comments

Joey Ye - March 4, 2013, 8:10 a.m.
> -----Original Message-----
> From: Joseph Myers [mailto:joseph@codesourcery.com]
> Sent: Monday, March 04, 2013 00:49
> To: Joey Ye
> Cc: gcc-patches@gcc.gnu.org
> Subject: RE: [PATCH] Fix PR50293 - LTO plugin with space in path
> 
> On Mon, 18 Feb 2013, Joey Ye wrote:
> 
> > +static char * convert_white_space (char *);
> 
> No space after "*".
Fixed
> 
> > -	      linker_plugin_file_spec = find_a_file (&exec_prefixes,
> > +	      char * temp_spec = find_a_file (&exec_prefixes,
> >  						     LTOPLUGINSONAME, R_OK,
> >  						     false);
> 
> The indentation of the following lines looks odd after this patch;
> unless
> that's just an effect of TABs plus quoting, make sure they are
> reindented
> to line up with the new position of the opening '('.
They was unchanged. But since the line with '(' changed, it need changing
too.

Fixed
> 
> > +/* Insert back slash before spaces in orig (usually a file path), to
> 
> Capitalize variable names when referring to the value of the variable,
> so
> ORIG; likewise elsewhere in this comment.  Single work "backslash".
> 
> > +   the filename should be treated as a single argument rather than
> being
> 
> "file name" should be two words, according to the GNU Coding Standards.
> 
> > +   This function converts and only converts all occurrance of ' '
> 
> "occurrence"
> 
> > +   Return: orig if no conversion needed. orig if conversion needed
> but no
> > +   sufficient memory for a new string. Otherwise a newly allocated
> string
> 
> Returning wrong results on insufficient memory doesn't make sense.
> Anyway, xmalloc always exits the program if there is insufficient memory,
> so you don't need any code to allow for that case.
Fixed. Though it is conflicting with secure coding practice.
> 
> > +static char * convert_white_space (char *orig)
> 
> Newline, not space, between return type and function name, so that the
> function name comes at the start of the line.
Fixed.

> 
> > +  if (orig == NULL) return orig;
> 
> The comment didn't mention NULL as a valid argument, and it doesn't
> appear
> NULL can actually be passed to this function.  So don't include code to
> handle that case.
Fixed.

> 
> > +  for (len=0; orig[len]; len++)
> 
> Spaces around "=".
Fixed.

> 
> > +    if (orig[len] == ' ' || orig[len] == '\t') number_of_space ++;
> 
> No space before "++", but put the body of the "if" on a separate line.
Fixed.
> 
> > +      char * new_spec = (char *)xmalloc (len + number_of_space + 1);
> 
> No space after "*".  Space in the cast after "(char *)".
Fixed.
> 
> > +      int j,k;
> 
> Space after ",".
Fixed.
> 
> > +      if (new_spec == NULL) return orig;
> 
> As discussed above, not needed.
Removed.
> 
> > +      for (j=0, k=0; j<=len; j++, k++)
> 
> Spaces around "=" and "<=".
Fixed.
> 
> > +	  if (orig[j] == ' ' || orig[j] == '\t') new_spec[k++] = '\\';
> 
> Put the "if" both on a separate line.
Fixed.
> 
> > +  else return orig;
> 
> Put the "else" body on a separate line.
Fixed.
> 
> --
> Joseph S. Myers
> joseph@codesourcery.com

 /* The Specs Language
 
@@ -6595,6 +6596,7 @@
 				    X_OK, false);
   if (lto_wrapper_file)
     {
+      lto_wrapper_file = convert_white_space (lto_wrapper_file);
       lto_wrapper_spec = lto_wrapper_file;
       obstack_init (&collect_obstack);
       obstack_grow (&collect_obstack, "COLLECT_LTO_WRAPPER=",
@@ -7005,12 +7007,13 @@
 			      + strlen (fuse_linker_plugin), 0))
 #endif
 	    {
-	      linker_plugin_file_spec = find_a_file (&exec_prefixes,
-						     LTOPLUGINSONAME, R_OK,
-						     false);
-	      if (!linker_plugin_file_spec)
+	      char *temp_spec = find_a_file (&exec_prefixes,
+					     LTOPLUGINSONAME, R_OK,
+					     false);
+	      if (!temp_spec)
 		fatal_error ("-fuse-linker-plugin, but %s not found",
 			     LTOPLUGINSONAME);
+	      linker_plugin_file_spec = convert_white_space (temp_spec);
 	    }
 #endif
 	  lto_gcc_spec = argv[0];
@@ -8506,3 +8509,51 @@
   free (name);
   return result;
 }
+
+/* Insert backslash before spaces in ORIG (usually a file path), to 
+   avoid being broken by spec parser.
+
+   This function is needed as do_spec_1 treats white space (' ' and '\t')
+   as the end of an argument. But in case of -plugin /usr/gcc
install/xxx.so,
+   the file name should be treated as a single argument rather than being
+   broken into multiple. Solution is to insert '\\' before the space in a 
+   file name.
+   
+   This function converts and only converts all occurrence of ' ' 
+   to '\\' + ' ' and '\t' to '\\' + '\t'.  For example:
+   "a b"  -> "a\\ b"
+   "a  b" -> "a\\ \\ b"
+   "a\tb" -> "a\\\tb"
+   "a\\ b" -> "a\\\\ b"
+
+   orig: input null-terminating string that was allocated by xalloc. The
+   memory it points to might be freed in this function. Behavior undefined
+   if ORIG wasn't xalloced or was freed already at entry.
+
+   Return: ORIG if no conversion needed. Otherwise a newly allocated string
+   that was converted from ORIG.  */
+
+static char *
+convert_white_space (char *orig)
+{
+  int len, number_of_space = 0;
+
+  for (len = 0; orig[len]; len++)
+    if (orig[len] == ' ' || orig[len] == '\t') number_of_space++;
+
+  if (number_of_space)
+    {
+      char *new_spec = (char *)xmalloc (len + number_of_space + 1);
+      int j, k;
+      for (j = 0, k = 0; j <= len; j++, k++)
+	{
+	  if (orig[j] == ' ' || orig[j] == '\t')
+	    new_spec[k++] = '\\';
+	  new_spec[k] = orig[j];
+	}
+      free (orig);
+      return new_spec;
+  }
+  else
+    return orig;
+}
Index: gcc/gcc.c
===================================================================
--- gcc/gcc.c	(revision 195189)
+++ gcc/gcc.c	(working copy)
@@ -265,6 +265,7 @@
 static const char *compare_debug_auxbase_opt_spec_function (int, const char **);
 static const char *pass_through_libs_spec_func (int, const char **);
 static const char *replace_extension_spec_func (int, const char **);
+static char *convert_white_space (char *);
 
 /* The Specs Language
 
@@ -6595,6 +6596,7 @@
 				    X_OK, false);
   if (lto_wrapper_file)
     {
+      lto_wrapper_file = convert_white_space (lto_wrapper_file);
       lto_wrapper_spec = lto_wrapper_file;
       obstack_init (&collect_obstack);
       obstack_grow (&collect_obstack, "COLLECT_LTO_WRAPPER=",
@@ -7005,12 +7007,13 @@
 			      + strlen (fuse_linker_plugin), 0))
 #endif
 	    {
-	      linker_plugin_file_spec = find_a_file (&exec_prefixes,
-						     LTOPLUGINSONAME, R_OK,
-						     false);
-	      if (!linker_plugin_file_spec)
+	      char *temp_spec = find_a_file (&exec_prefixes,
+					     LTOPLUGINSONAME, R_OK,
+					     false);
+	      if (!temp_spec)
 		fatal_error ("-fuse-linker-plugin, but %s not found",
 			     LTOPLUGINSONAME);
+	      linker_plugin_file_spec = convert_white_space (temp_spec);
 	    }
 #endif
 	  lto_gcc_spec = argv[0];
@@ -8506,3 +8509,51 @@
   free (name);
   return result;
 }
+
+/* Insert backslash before spaces in ORIG (usually a file path), to 
+   avoid being broken by spec parser.
+
+   This function is needed as do_spec_1 treats white space (' ' and '\t')
+   as the end of an argument. But in case of -plugin /usr/gcc install/xxx.so,
+   the file name should be treated as a single argument rather than being
+   broken into multiple. Solution is to insert '\\' before the space in a 
+   file name.
+   
+   This function converts and only converts all occurrence of ' ' 
+   to '\\' + ' ' and '\t' to '\\' + '\t'.  For example:
+   "a b"  -> "a\\ b"
+   "a  b" -> "a\\ \\ b"
+   "a\tb" -> "a\\\tb"
+   "a\\ b" -> "a\\\\ b"
+
+   orig: input null-terminating string that was allocated by xalloc. The
+   memory it points to might be freed in this function. Behavior undefined
+   if ORIG wasn't xalloced or was freed already at entry.
+
+   Return: ORIG if no conversion needed. Otherwise a newly allocated string
+   that was converted from ORIG.  */
+
+static char *
+convert_white_space (char *orig)
+{
+  int len, number_of_space = 0;
+
+  for (len = 0; orig[len]; len++)
+    if (orig[len] == ' ' || orig[len] == '\t') number_of_space++;
+
+  if (number_of_space)
+    {
+      char *new_spec = (char *)xmalloc (len + number_of_space + 1);
+      int j, k;
+      for (j = 0, k = 0; j <= len; j++, k++)
+	{
+	  if (orig[j] == ' ' || orig[j] == '\t')
+	    new_spec[k++] = '\\';
+	  new_spec[k] = orig[j];
+	}
+      free (orig);
+      return new_spec;
+  }
+  else
+    return orig;
+}
Joseph S. Myers - March 6, 2013, 2:12 a.m.
On Mon, 4 Mar 2013, Joey Ye wrote:

> +      char *new_spec = (char *)xmalloc (len + number_of_space + 1);

Space in cast between "(char *)" and "xmalloc".  OK with that change.

Patch

Index: gcc/gcc.c
===================================================================
--- gcc/gcc.c	(revision 195189)
+++ gcc/gcc.c	(working copy)
@@ -265,6 +265,7 @@ 
 static const char *compare_debug_auxbase_opt_spec_function (int, const char
**);
 static const char *pass_through_libs_spec_func (int, const char **);
 static const char *replace_extension_spec_func (int, const char **);
+static char *convert_white_space (char *);