Changeset effbb7 in libssh2

Timestamp:

02/01/12 10:56:42 (4 months ago)

Author:

peter.stuge.se

Branches:

master

Children:

e95c7d

Parents:

0ebe6f

git-author:

Peter Stuge <peter@…> (02/01/12 10:56:42)

git-committer:

Peter Stuge <peter@…> (02/01/12 11:35:05)

Message:

example/subsystem_netconf.c: Return error when read buffer is too small

Also remove a little redundancy in the read loop condition.

File:

• example/subsystem_netconf.c (modified) (2 diffs)

example/subsystem_netconf.c

@@ -62 +62 @@
                               char *buf, size_t buflen)
 {
-    ssize_t len, rd = 0;
+    ssize_t len;
+    size_t rd = 0;
     char *endreply = NULL, *specialsequence = NULL;
 
@@ -86 +87 @@
             specialsequence = strstr(endreply, "]]>]]>");
 
-    } while (!endreply || !specialsequence);
+    } while (!specialsequence && rd < buflen);
+
+    if (!specialsequence) {
+        fprintf(stderr, "%s: ]]>]]> not found! read buffer too small?\n", __func__);
+        return -1;
+    }
 
     /* discard the special sequence so that only XML is returned */