Changeset 61d2eabb for protocols/skype/skype.c

Timestamp:

2013-02-14T15:20:00Z (11 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

33ed455

Parents:

b6ab05b

git-author:

Mike Kazantsev <mk.fraggod@…> (14-02-13 15:20:00)

git-committer:

Miklos Vajna <vmiklos@…> (14-02-13 15:20:00)

Message:

skype: check for truncated commands on receiving

File:

• protocols/skype/skype.c (modified) (2 diffs)

protocols/skype/skype.c

@@ -29 +29 @@
 #define SKYPE_DEFAULT_SERVER "localhost"
 #define SKYPE_DEFAULT_PORT "2727"
-#define IRC_LINE_SIZE 1024
+#define IRC_LINE_SIZE 16384
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
@@ -1147 +1147 @@
         /* Read the whole data. */
         st = ssl_read(sd->ssl, buf, sizeof(buf));
+        if (st >= IRC_LINE_SIZE-1) {
+                /* As we don't buffer incoming data, if IRC_LINE_SIZE amount of bytes
+                 * were received, there's a good chance last message was truncated
+                 * and the next recv() will yield garbage. */
+                imcb_error(ic, "Unable to handle incoming data from skyped");
+                st = 0;
+        }
         if (st > 0) {
                 buf[st] = '\0';