Attachment 25313 Details for Bug 62474

mpg123-0.59s-http-auth-overflow.patch

mpg123-0.59s-http-auth-overflow.patch (text/x-diff), 1.47 KB, created by Vladimir Nadvornik on 2004-10-22 18:33:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Nadvornik

Created: 2004-10-22 18:33:23 UTC

Size: 1.47 KB

patch

obsolete

>--- httpget.c
>+++ httpget.c
>@@ -112,6 +112,8 @@
>   destination[n++] = 0;
> }
> 
>+#define MAX_AUTH 256
>+
> /* VERY  simple auth-from-URL grabber */
> int getauthfromURL(char *url,char *auth)
> {
>@@ -131,6 +133,10 @@
>       if( url[i] == '/' )
>          return 0;
>     }
>+    if (pos-url >= MAX_AUTH) {
>+	fprintf(stderr, "getauthfromURL: auth string is too long\n");
>+	exit(1);
>+    }
>     strncpy(auth,url,pos-url);
>     auth[pos-url] = 0;
>     strcpy(url,pos+1);
>@@ -223,7 +229,7 @@
> #define ACCEPT_HEAD "Accept: audio/mpeg, audio/x-mpegurl, */*\r\n"
> 
> char *httpauth = NULL;
>-char httpauth1[256];
>+char httpauth1[MAX_AUTH];
> 
> int http_open (char *url)
> {
>@@ -273,7 +279,7 @@
>                }
> 
> 	
>-	if ((linelength = strlen(url)+200) < 1024)
>+	if ((linelength = strlen(url)+200+MAX_AUTH*4) < 1024)
> 		linelength = 1024;
> 	if (!(request = malloc(linelength)) || !(purl = malloc(1024))) {
> 		fprintf (stderr, "malloc() failed, out of memory.\n");
>@@ -397,12 +403,18 @@
> 		}
> 
> 		if (strlen(httpauth1) || httpauth) {
>-			char buf[1023];
>+			char buf[MAX_AUTH * 4];
> 			strcat (request,"Authorization: Basic ");
>                         if(strlen(httpauth1))
>                           encode64(httpauth1,buf);
>-                        else
>+                        else {
>+			  if (strlen(httpauth) >= MAX_AUTH) {
>+			    fprintf(stderr, "http_open: auth string is too long\n");
>+			    exit(1);
>+			  }
> 			  encode64(httpauth,buf);
>+			}
>+			
> 			strcat (request,buf);
> 			strcat (request,"\r\n");
> 		}

Actions: View

Attachments on bug 62474: 25313