Changeset 9ad86bb

Timestamp:

2008-03-15T16:09:50Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a869d91

Parents:

7f421d6

Message:

Fixed issues with "long" URLs in url.c. Reusing code from 2001 wasn't a
good idea...

Files:

• bitlbee.h (modified) (1 diff)
• lib/url.c (modified) (6 diffs)
• lib/url.h (modified) (2 diffs)

bitlbee.h

@@ -33 +33 @@
 #define VERSION BITLBEE_VERSION
 
-#define MAX_STRING 128
+#define MAX_STRING 511
 
 #if HAVE_CONFIG_H

lib/url.c

@@ -26 +26 @@
 #include "url.h"
 
-/* Convert an URL to a url_t structure                                  */
+/* Convert an URL to a url_t structure */
 int url_set( url_t *url, char *set_url )
 {
-        char s[MAX_STRING];
+        char s[MAX_STRING+1];
         char *i;
         
-        /* protocol://                                                  */
+        memset( url, 0, sizeof( url_t ) );
+        memset( s, 0, sizeof( s ) );
+        
+        /* protocol:// */
         if( ( i = strstr( set_url, "://" ) ) == NULL )
         {
@@ -49 +52 @@
                         url->proto = PROTO_SOCKS5;
                 else
-                {
-                        return( 0 );
-                }
+                        return 0;
+                
                 strncpy( s, i + 3, MAX_STRING );
         }
         
-        /* Split                                                        */
+        /* Split */
         if( ( i = strchr( s, '/' ) ) == NULL )
         {
@@ -67 +69 @@
         strncpy( url->host, s, MAX_STRING );
         
-        /* Check for username in host field                             */
+        /* Check for username in host field */
         if( strrchr( url->host, '@' ) != NULL )
         {
@@ -76 +78 @@
                 *url->pass = 0;
         }
-        /* If not: Fill in defaults                                     */
+        /* If not: Fill in defaults */
         else
         {
@@ -82 +84 @@
         }
         
-        /* Password?                                                    */
+        /* Password? */
         if( ( i = strchr( url->user, ':' ) ) != NULL )
         {
@@ -88 +90 @@
                 strcpy( url->pass, i + 1 );
         }
-        /* Port number?                                                 */
+        /* Port number? */
         if( ( i = strchr( url->host, ':' ) ) != NULL )
         {

lib/url.h

@@ -26 +26 @@
 #include "bitlbee.h"
 
-#define PROTO_HTTP              2
-#define PROTO_HTTPS             5
-#define PROTO_SOCKS4    3
-#define PROTO_SOCKS5    4
-#define PROTO_DEFAULT   PROTO_HTTP
+#define PROTO_HTTP      2
+#define PROTO_HTTPS     5
+#define PROTO_SOCKS4    3
+#define PROTO_SOCKS5    4
+#define PROTO_DEFAULT   PROTO_HTTP
 
 typedef struct url
@@ -36 +36 @@
         int proto;
         int port;
-        char host[MAX_STRING];
-        char file[MAX_STRING];
-        char user[MAX_STRING];
-        char pass[MAX_STRING];
+        char host[MAX_STRING+1];
+        char file[MAX_STRING+1];
+        char user[MAX_STRING+1];
+        char pass[MAX_STRING+1];
 } url_t;