MonetDB: Jul2012 - read_from_stream: re-set all pointers after r...

[Fabian Groffen]

Changeset: 0ebfdeaf07bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ebfdeaf07bb
Modified Files:
        monetdb5/extras/jaql/json.c
Branch: Jul2012
Log Message:

read_from_stream: re-set all pointers after realloc


diffs (20 lines):

diff --git a/monetdb5/extras/jaql/json.c b/monetdb5/extras/jaql/json.c
--- a/monetdb5/extras/jaql/json.c
+++ b/monetdb5/extras/jaql/json.c
@@ -109,11 +109,16 @@ read_from_stream(jsonbat *jb, char **pos
 
        shift = *pos - jb->streambuf;
        if (*pos == jb->streambuf + jb->streambuflen) {
+               size_t rshift = *recall - jb->streambuf;
                char *newbuf = realloc(jb->streambuf, jb->streambuflen += 8096);
                if (newbuf == NULL)
                        return 0;
                jb->streambuf = newbuf;
                *pos = jb->streambuf + shift;
+               if (pos != start)
+                       *start = jb->streambuf;
+               if (recall != NULL)
+                       *recall = jb->streambuf + rshift;
        }
 
        sret = mnstr_read(jb->is, *pos, 1, jb->streambuflen - shift - 1);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list