]> git.sur5r.net Git - openldap/commitdiff
ITS#8066 fix mdb_load with large values
authorHoward Chu <hyc@openldap.org>
Thu, 26 Feb 2015 21:36:04 +0000 (21:36 +0000)
committerHoward Chu <hyc@openldap.org>
Thu, 26 Feb 2015 21:36:04 +0000 (21:36 +0000)
libraries/liblmdb/mdb_load.c

index e0d95e13c3f6f006888e19b55d4f35a4d0c7eb80..39dac33122d18226beab4cdbadb3f276bd9db817 100644 (file)
@@ -176,7 +176,7 @@ static int unhex(unsigned char *c2)
 static int readline(MDB_val *out, MDB_val *buf)
 {
        unsigned char *c1, *c2, *end;
-       size_t len;
+       size_t len, l2;
        int c;
 
        if (!(mode & NOHDR)) {
@@ -206,6 +206,7 @@ badend:
 
        c1 = buf->mv_data;
        len = strlen((char *)c1);
+       l2 = len;
 
        /* Is buffer too short? */
        while (c1[len-1] != '\n') {
@@ -217,17 +218,18 @@ badend:
                        return EOF;
                }
                c1 = buf->mv_data;
-               c1 += buf->mv_size;
-               if (fgets((char *)c1, buf->mv_size, stdin) == NULL) {
+               c1 += l2;
+               if (fgets((char *)c1, buf->mv_size+1, stdin) == NULL) {
                        Eof = 1;
                        badend();
                        return EOF;
                }
                buf->mv_size *= 2;
                len = strlen((char *)c1);
+               l2 += len;
        }
        c1 = c2 = buf->mv_data;
-       len = strlen((char *)c1);
+       len = l2;
        c1[--len] = '\0';
        end = c1 + len;