Changes in lib/misc.c [0e788f5:e252d8c]

File:

• lib/misc.c (modified) (8 diffs)

lib/misc.c

@@ -420 +420 @@
 void random_bytes( unsigned char *buf, int count )
 {
-#ifndef _WIN32
         static int use_dev = -1;
         
@@ -470 +469 @@
         
         if( !use_dev )
-#endif
         {
                 int i;
@@ -525 +523 @@
         ns_msg nsh;
         ns_rr rr;
-        int i, n, len, size;
+        int n, len, size;
         
         g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
@@ -538 +536 @@
         while( ns_parserr( &nsh, ns_s_an, n, &rr ) == 0 )
         {
-                size = ns_rr_rdlen( rr );
+                char name[NS_MAXDNAME];
+
+                if( ns_rr_rdlen( rr ) < 7)
+                    break;
+
                 buf = ns_rr_rdata( rr );
                 
-                len = 0;
-                for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
-                        len += buf[i] + 1;
-                
-                if( i > size )
+                if( dn_expand(querybuf, querybuf + size, &buf[6], name, NS_MAXDNAME) == -1 )
                         break;
+
+                len = strlen(name) + 1;
                 
                 reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
-                memcpy( reply->name, buf + 7, len );
-                
-                for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
-                        reply->name[i] = '.';
-                
-                if( i > len )
-                {
-                        g_free( reply );
-                        break;
-                }
+                memcpy( reply->name, name, len );
                 
                 reply->prio = ( buf[0] << 8 ) | buf[1];
@@ -682 +673 @@
    white\ space in 'various ways'. Returns a NULL-terminated static
    char** so watch out with nested use! Definitely not thread-safe. */
-char **split_command_parts( char *command )
+char **split_command_parts( char *command, int limit )
 {
         static char *cmd[IRC_MAX_ARGS+1];
@@ -692 +683 @@
         k = 1;
         for( s = command; *s && k < IRC_MAX_ARGS; s ++ )
+        {
                 if( *s == ' ' && !q )
                 {
                         *s = 0;
                         while( *++s == ' ' );
-                        if( *s == '"' || *s == '\'' )
+                        if( k != limit && (*s == '"' || *s == '\'') )
                         {
                                 q = *s;
@@ -704 +696 @@
                         {
                                 cmd[k++] = s;
+                                if (limit && k > limit) {
+                                        break;
+                                }
                                 s --;
                         }
@@ -722 +717 @@
                         q = *s = 0;
                 }
+        }
         
         /* Full zero-padding for easier argc checking. */