Changeset 23 in chevmsgr

Timestamp:

11/28/15 20:58:01 (8 years ago)

Author:

cheese

Message:

bug fix

Location:

trunk

Files:

• crypto.cpp (modified) (1 diff)
• msgsrv.cpp (modified) (3 diffs)

trunk/crypto.cpp

@@ -63 +63 @@
     ::CHEV_ARIA_Decrypt(&info, input.buffer(), input.size(), out.buffer(), &outSize);
 
-    paddingSize = out[outSize - 1];
+    paddingSize = (cf::uint32_t)out[outSize - 1];
+    if ((unsigned int)paddingSize > (unsigned int)outSize)
+        THROW_EXCEPTION("invalid padding size");
 
     plainSize = outSize - paddingSize;

trunk/msgsrv.cpp

@@ -36 +36 @@
     for (int i = 0; i < argc; i++)
     {
-        if (stricmp(colName[i], "sms"))
+        if (!stricmp(colName[i], "sms"))
         {
             *sms = argv[i];
@@ -541 +541 @@
         while (result)
         {
-            std::string message = sock->receive().toString();
+            std::string message = gOnlineUsers[id].receive();
             Protocol::Message parser;
             parser.parse(message);
@@ -560 +560 @@
             }
 
-            sock->send(response.result(parser.type(), result));
+            gOnlineUsers[id].send(response.result(parser.type(), result));
         }
     }