icq: Don't fail on buddy icon hash longer than 16

licq-im · Jan 12, 2013 · 99b6f98 · 99b6f98
1 parent fd62d36
commit 99b6f98
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/licq/src/icq/icq-srv.cpp b/licq/src/icq/icq-srv.cpp
@@ -1,6 +1,6 @@
 /*
  * This file is part of Licq, an instant messaging client for UNIX.
- * Copyright (C) 1998-2012 Licq developers <licq-dev@googlegroups.com>
+ * Copyright (C) 1998-2013 Licq developers <licq-dev@googlegroups.com>
  *
  * Licq is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2147,7 +2147,6 @@ void IcqProtocol::processIconHash(User* u, Buffer& packet)
       case BART_TYPExBUDDY_ICON_PHOTO:
       {
         // TODO: Handle photo item
-        packet.incDataPosRead(length);
         break;
       }
       case BART_TYPExBUDDY_ICON:
@@ -2161,38 +2160,37 @@ void IcqProtocol::processIconHash(User* u, Buffer& packet)
           u->setBuddyIconType(type);
           u->setBuddyIconHashType(flags);
           u->save(Licq::User::SavePictureInfo);
+          continue;
         }
         break;
       }
       case BART_TYPExSTATUS_STR:
       {
         // TODO: Handle status string
-        packet.incDataPosRead(length);
         break;
       }
       case BART_TYPExSTATUS_STR_TIMESTAMP:
       {
         // TODO: Handle status string timestamp
-        packet.incDataPosRead(length);
         break;
       }
       case BART_TYPExSTATUS_MOOD:
       {
         // TODO: Handle status mood item
-        packet.incDataPosRead(length);
         break;
       }
       case BART_TYPExITUNES_LINK:
       {
         // TODO: Handle iTunes music store link
-        packet.incDataPosRead(length);
         break;
       }
       default:
         gLog.warning(tr("Unknown Extended Status Data type 0x%04x flags 0x%02x length 0x%02x"),
             type, flags, length);
-        packet.incDataPosRead(length);
     }
+
+    // Unhandled part, skip the data
+    packet.incDataPosRead(length);
   }
 }