Fix crash when receiving a message of an unknown type (#1)

Matti Virkkunen · Saket Srivastava
1 parent 9b7b0197
Showing 2 changed files with 19 additions and 3 deletions
libpurple/line.thrift
libpurple/purpleline_write.cpp
@@ -17,8 +17,21 @@ enum ContentType {
     IMAGE = 1;
     VIDEO = 2;
     AUDIO = 3;
+    HTML = 4;
+    PDF = 5;
+    CALL = 6;
     STICKER = 7;
+    PRESENCE = 8;
+    GIFT = 9;
+    GROUPBOARD = 10;
+    APPLINK = 11;
+    LINK = 12;
+    CONTACT = 13;
+    FILE = 14;
     LOCATION = 15;
+    POSTNOTIFICATION = 16;
+    RICH = 17;
+    CHATEVENT = 18;
 }
  
 enum ErrorCode {
@@ -235,9 +235,12 @@ void PurpleLine::write_message(line::Message &amp;msg, bool replay) {
         // TODO: other content types
  
         default:
-            text = "<em>[Not implemented: ";
-            text += line::_ContentType_VALUES_TO_NAMES.at(msg.contentType);
-            text += " message]</em>";
+            text = "<em>[Unimplemented message type: ";
+            text += line::_ContentType_VALUES_TO_NAMES.count(msg.contentType)
+                ? line::_ContentType_VALUES_TO_NAMES.at(msg.contentType)
+                : "TYPE " + std::to_string(msg.contentType);
+            text += "]</em>";
+
             break;
     }