Attachment 280381 Details for Bug 415141 – Proposed upstream patch

[patch] Proposed upstream patch

cups-vendorsec2-patch.txt (text/plain), 4.77 KB, created by Josh Bressers on 2007-12-07 01:26:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2007-12-07 01:26:44 UTC

Size: 4.77 KB

patch

obsolete

>Index: scsi.c
>===================================================================
>--- scsi.c	(revision 7112)
>+++ scsi.c	(working copy)
>@@ -106,7 +106,7 @@
>{
>  char		method[255],	/* Method in URI */
>		hostname[1024],	/* Hostname */
>-		username[255],	/* Username info (not used) */
>+		username[1024],	/* Username info (not used) */
>		resource[1024],	/* Resource info (device and options) */
>		*options;	/* Pointer to options */
>  int		port;		/* Port number (not used) */
>Index: lpd.c
>===================================================================
>--- lpd.c	(revision 7112)
>+++ lpd.c	(working copy)
>@@ -120,7 +120,7 @@
>{
>  char			method[255],	/* Method in URI */
>			hostname[1024],	/* Hostname */
>-			username[255],	/* Username info */
>+			username[1024],	/* Username info */
>			resource[1024],	/* Resource info (printer name) */
>			*options,	/* Pointer to options */
>			name[255],	/* Name of option */
>@@ -275,9 +275,9 @@
>      * Get the name...
>      */
>
>-      for (ptr = name; *options && *options != '=';)
>+      for (ptr = name; *options && *options != '='; options++)
>        if (ptr < (name + sizeof(name) - 1))
>-          *ptr++ = *options++;
>+          *ptr++ = *options;
>      *ptr = '\0';
>
>      if (*options == '=')
>@@ -288,9 +288,9 @@
>
>        options ++;
>
>-	for (ptr = value; *options && *options != '+';)
>+	for (ptr = value; *options && *options != '+'; options++)
>          if (ptr < (value + sizeof(value) - 1))
>-            *ptr++ = *options++;
>+            *ptr++ = *options;
>	*ptr = '\0';
>
>	if (*options == '+')
>Index: serial.c
>===================================================================
>--- serial.c	(revision 7112)
>+++ serial.c	(working copy)
>@@ -103,7 +103,7 @@
>{
>  char		method[255],	/* Method in URI */
>		hostname[1024],	/* Hostname */
>-		username[255],	/* Username info (not used) */
>+		username[1024],	/* Username info (not used) */
>		resource[1024],	/* Resource info (device and options) */
>		*options,	/* Pointer to options */
>		name[255],	/* Name of option */
>@@ -250,9 +250,9 @@
>      * Get the name...
>      */
>
>-      for (ptr = name; *options && *options != '=';)
>+      for (ptr = name; *options && *options != '='; options++)
>        if (ptr < (name + sizeof(name) - 1))
>-          *ptr++ = *options++;
>+          *ptr++ = *options;
>      *ptr = '\0';
>
>      if (*options == '=')
>@@ -263,9 +263,9 @@
>
>        options ++;
>
>-	for (ptr = value; *options && *options != '+';)
>+	for (ptr = value; *options && *options != '+'; options++)
>          if (ptr < (value + sizeof(value) - 1))
>-            *ptr++ = *options++;
>+            *ptr++ = *options;
>	*ptr = '\0';
>
>	if (*options == '+')
>Index: ipp.c
>===================================================================
>--- ipp.c	(revision 7112)
>+++ ipp.c	(working copy)
>@@ -97,7 +97,7 @@
>  cups_option_t	*options;	/* Printer options */
>  char		method[255],	/* Method in URI */
>		hostname[1024],	/* Hostname */
>-		username[255],	/* Username info */
>+		username[1024],	/* Username info */
>		resource[1024],	/* Resource info (printer name) */
>		*optptr,	/* Pointer to URI options */
>		name[255],	/* Name of option */
>@@ -296,9 +296,9 @@
>      * Get the name...
>      */
>
>-      for (ptr = name; *optptr && *optptr != '=';)
>+      for (ptr = name; *optptr && *optptr != '='; optptr++)
>        if (ptr < (name + sizeof(name) - 1))
>-          *ptr++ = *optptr++;
>+          *ptr++ = *optptr;
>      *ptr = '\0';
>
>      if (*optptr == '=')
>Index: socket.c
>===================================================================
>--- socket.c	(revision 7112)
>+++ socket.c	(working copy)
>@@ -76,7 +76,7 @@
>{
>  char		method[255],	/* Method in URI */
>		hostname[1024],	/* Hostname */
>-		username[255],	/* Username info (not used) */
>+		username[1024],	/* Username info (not used) */
>		resource[1024];	/* Resource info (not used) */
>  int		fp;		/* Print file */
>  int		copies;		/* Number of copies to print */
>Index: usb.c
>===================================================================
>--- usb.c	(revision 7112)
>+++ usb.c	(working copy)
>@@ -148,7 +148,7 @@
>  const char	*uri;			/* Device URI */
>  char		method[255],		/* Method in URI */
>		hostname[1024],		/* Hostname */
>-		username[255],		/* Username info (not used) */
>+		username[1024],		/* Username info (not used) */
>		resource[1024],		/* Resource info (device and options) */
>		*options;		/* Pointer to options */
>#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
>Index: parallel.c
>===================================================================
>--- parallel.c	(revision 7112)
>+++ parallel.c	(working copy)
>@@ -81,7 +81,7 @@
>{
>  char		method[255],	/* Method in URI */
>		hostname[1024],	/* Hostname */
>-		username[255],	/* Username info (not used) */
>+		username[1024],	/* Username info (not used) */
>		resource[1024],	/* Resource info (device and options) */
>		*options;	/* Pointer to options */
>  int		port;		/* Port number (not used) */

Actions: View | Diff

Attachments on bug 415141: 280381