MonetDB: Jul2021 - Set right pointer before returning

[Pedro Ferreira]

Changeset: 7e72c2a04490 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7e72c2a04490
Modified Files:
        monetdb5/modules/atoms/json.c
Branch: Jul2021
Log Message:

Set right pointer before returning


diffs (27 lines):

diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -1312,8 +1312,10 @@ JSONplaintext(char **r, size_t *l, size_
                if (*l < jt->elm[idx].valuelen - 2 + sep_len + 1) {
                        char *p = *r - *ilen + *l, *nr;
                        *ilen *= 2;
-                       if (!(nr = GDKrealloc(p, *ilen)))
+                       if (!(nr = GDKrealloc(p, *ilen))) {
+                               *r = p;
                                throw(MAL,"JSONplaintext", SQLSTATE(HY013) 
MAL_MALLOC_FAIL);
+                       }
                        *r = nr + *l;
                        *l = *ilen - *l;
                }
@@ -1397,8 +1399,10 @@ JSONplaintext(char **r, size_t *l, size_
                        size_t offset = *ilen - *l;
                        char *p = *r - offset, *nr;
                        *ilen *= 2;
-                       if (!(nr = GDKrealloc(p, *ilen)))
+                       if (!(nr = GDKrealloc(p, *ilen))) {
+                               *r = p;
                                throw(MAL,"JSONplaintext", SQLSTATE(HY013) 
MAL_MALLOC_FAIL);
+                       }
                        *r = nr + offset;
                        *l = *ilen - offset;
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list