Changes in protocols/oscar/tlv.c [fbc7844:b7d3cc34]

File:

• protocols/oscar/tlv.c (modified) (4 diffs)

protocols/oscar/tlv.c

@@ -1 +1 @@
 #include <aim.h>
 
+static aim_tlv_t *createtlv(void)
+{
+        return g_new0(aim_tlv_t, 1);
+}
+
 static void freetlv(aim_tlv_t **oldtlv)
 {
+
         if (!oldtlv || !*oldtlv)
                 return;
@@ -9 +15 @@
         g_free(*oldtlv);
         *oldtlv = NULL;
+
+        return;
 }
 
@@ -38 +46 @@
                 length = aimbs_get16(bs);
 
-                cur = g_new0(aim_tlvlist_t, 1);
-
-                cur->tlv = g_new0(aim_tlv_t, 1);
-                cur->tlv->type = type;
-                if ((cur->tlv->length = length))
-                        cur->tlv->value = aimbs_getraw(bs, length);     
-
-                cur->next = list;
-                list = cur;
+#if 0 /* temporarily disabled until I know if they're still doing it or not */
+                /*
+                 * Okay, so now AOL has decided that any TLV of
+                 * type 0x0013 can only be two bytes, despite
+                 * what the actual given length is.  So here 
+                 * we dump any invalid TLVs of that sort.  Hopefully
+                 * theres no special cases to this special case.
+                 *   - mid (30jun2000)
+                 */
+                if ((type == 0x0013) && (length != 0x0002))
+                        length = 0x0002;
+#else
+                if (0)
+                        ;
+#endif
+                else {
+
+                        cur = g_new0(aim_tlvlist_t, 1);
+
+                        cur->tlv = createtlv(); 
+                        cur->tlv->type = type;
+                        if ((cur->tlv->length = length))
+                               cur->tlv->value = aimbs_getraw(bs, length);      
+
+                        cur->next = list;
+                        list = cur;
+                }
         }
 
@@ -147 +173 @@
                 return 0;
 
-        if (!(newtlv->tlv = g_new0(aim_tlv_t, 1))) {
+        if (!(newtlv->tlv = createtlv())) {
                 g_free(newtlv);
                 return 0;