Changes in protocols/jabber/sasl.c [af97b23:ef5c185]

File:

• protocols/jabber/sasl.c (modified) (3 diffs)

protocols/jabber/sasl.c

@@ -21 +21 @@
 *                                                                           *
 \***************************************************************************/
-
-#include <ctype.h>
 
 #include "jabber.h"
@@ -109 +107 @@
 }
 
-/* Non-static function, but not mentioned in jabber.h because it's for internal
-   use, just that the unittest should be able to reach it... */
-char *sasl_get_part( char *data, char *field )
+static char *sasl_get_part( char *data, char *field )
 {
         int i, len;
         
         len = strlen( field );
-        
-        while( isspace( *data ) || *data == ',' )
-                data ++;
         
         if( g_strncasecmp( data, field, len ) == 0 && data[len] == '=' )
@@ -136 +129 @@
                         }
                         
-                        /* If we got a comma, we got a new field. Check it,
-                           find the next key after it. */
-                        if( data[i] == ',' )
+                        /* If we got a comma, we got a new field. Check it. */
+                        if( data[i] == ',' &&
+                            g_strncasecmp( data + i + 1, field, len ) == 0 &&
+                            data[i+len+1] == '=' )
                         {
-                                while( isspace( data[i] ) || data[i] == ',' )
-                                        i ++;
-                                
-                                if( g_strncasecmp( data + i, field, len ) == 0 &&
-                                    data[i+len] == '=' )
-                                {
-                                        i += len + 1;
-                                        break;
-                                }
+                                i += len + 2;
+                                break;
                         }
                 }