Attachment 976 Details for Bug 1481 – [FIXED_X11R68x] proposed patch

[patch] [FIXED_X11R68x] proposed patch

xman.diff (text/plain), 2.38 KB, created by Matthieu Herrb on 2004-09-28 14:11:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Herrb

Created: 2004-09-28 14:11:21 UTC

Size: 2.38 KB

patch

obsolete

>Index: search.c
>===================================================================
>RCS file: /cvs/fd/xorg/xc/programs/xman/search.c,v
>retrieving revision 1.5
>diff -u -r1.5 search.c
>--- search.c	2 Sep 2004 08:40:33 -0000	1.5
>+++ search.c	28 Sep 2004 21:05:03 -0000
>@@ -169,6 +169,10 @@
>     return(NULL);
>   }
> 
>+  if (strlen(search_string) >= BUFSIZ) {
>+    PopupWarning(man_globals, "Search string too long.");
>+    return(NULL);
>+  }
>   if (search_string[0] == ' ') {
>     PopupWarning(man_globals, "First character cannot be a space.");
>     return(NULL);
>@@ -205,16 +209,17 @@
>       strcpy(path,manpath);
>     }
> 
>-    sprintf(label,"Results of apropos search on: %s", search_string);
>+    snprintf(label, sizeof(label), 
>+	"Results of apropos search on: %s", search_string);
> 
> #ifdef NO_MANPATH_SUPPORT	/* not quite correct, but the best I can do. */
>-    sprintf(cmdbuf, APROPOS_FORMAT, search_string, mantmp);
>+    snprintf(cmdbuf, sizeof(cmdbuf), APROPOS_FORMAT, search_string, mantmp);
> #else
>-    sprintf(cmdbuf, APROPOS_FORMAT, path, search_string, mantmp);
>+    snprintf(cmdbuf, sizeof(cmdbuf), APROPOS_FORMAT, path, search_string, mantmp);
> #endif
> 
>     if(system(cmdbuf) != 0) {	/* execute search. */
>-      sprintf(error_buf,"Something went wrong trying to run %s\n",cmdbuf);
>+	snprintf(error_buf, sizeof(error_buf), "Something went wrong trying to run %s\n",cmdbuf);
>       PopupWarning(man_globals, error_buf);
>     }
> 
>@@ -232,7 +237,7 @@
> 
>     unlink(mantmp);
> 
>-    sprintf(string_buf,"%s: nothing appropriate", search_string);
>+    snprintf(string_buf, sizeof(string_buf), "%s: nothing appropriate", search_string);
> 
>     /*
>      * Check first LOOKLINES lines for "nothing appropriate".
>@@ -263,14 +268,15 @@
>       return(NULL);
>     }
>   
>-    strcpy(man_globals->manpage_title,label);
>+    snprintf(man_globals->manpage_title, sizeof(man_globals->manpage_title), 
>+	     "%s", label);
>     ChangeLabel(man_globals->label,label);
>     fseek(file, 0L, SEEK_SET);		/* reset file to point at top. */
>   }
>   else {			/* MANUAL SEACH */
>     file = DoManualSearch(man_globals, search_string);
>     if (file == NULL) {
>-      sprintf(string_buf,"No manual entry for %s.", search_string);
>+      snprintf(string_buf, sizeof(string_buf), "No manual entry for %s.", search_string);
>       ChangeLabel(man_globals->label, string_buf);
>       if (man_globals->label == NULL)
> 	PopupWarning(man_globals, string_buf);

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1481: 976

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.