Changeset 4eb4c0f for protocols/jabber/sasl.c

Timestamp:

2008-02-16T17:15:31Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

fd9fa52

Parents:

8961950 (diff), ca60550 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in upstream changes

File:

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

protocols/jabber/sasl.c

@@ -21 +21 @@
 *                                                                           *
 \***************************************************************************/
+
+#include <ctype.h>
 
 #include "jabber.h"
@@ -107 +109 @@
 }
 
-static char *sasl_get_part( char *data, char *field )
+/* 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 )
 {
         int i, len;
         
         len = strlen( field );
+        
+        while( isspace( *data ) || *data == ',' )
+                data ++;
         
         if( g_strncasecmp( data, field, len ) == 0 && data[len] == '=' )
@@ -129 +136 @@
                         }
                         
-                        /* 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] == '=' )
+                        /* If we got a comma, we got a new field. Check it,
+                           find the next key after it. */
+                        if( data[i] == ',' )
                         {
-                                i += len + 2;
-                                break;
+                                while( isspace( data[i] ) || data[i] == ',' )
+                                        i ++;
+                                
+                                if( g_strncasecmp( data + i, field, len ) == 0 &&
+                                    data[i+len] == '=' )
+                                {
+                                        i += len + 1;
+                                        break;
+                                }
                         }
                 }