[tarantool-patches] Re: [PATCH v4 2/8] sql: set SQL parser errors via diag_set()

[n.pettik]

Almost forgot. Apply this small diff please.
You confused malloc with realloc in diag_set().
And it improves readability of code.

diff --git a/src/box/sql/malloc.c b/src/box/sql/malloc.c
index 8812298e0..83ab23589 100644
--- a/src/box/sql/malloc.c
+++ b/src/box/sql/malloc.c
@@ -51,12 +51,12 @@ sql_sized_malloc(int nByte)
        assert(nByte > 0);
        nByte = ROUND8(nByte);
        p = malloc(nByte + 8);
-       if (p) {
-               p[0] = nByte;
-               p++;
-       } else {
-               diag_set(OutOfMemory, nByte, "realloc", "p");
+       if (p == NULL) {
+               diag_set(OutOfMemory, nByte, "malloc", "p");
+               return NULL;
        }
+       p[0] = nByte;
+       p++;
        return (void *)p;
 }
 
@@ -109,12 +109,12 @@ sql_sized_realloc(void *pPrior, int nByte)
        assert(nByte == ROUND8(nByte)); /* EV: R-46199-30249 */
        p--;
        p = realloc(p, nByte + 8);
-       if (p) {
-               p[0] = nByte;
-               p++;
-       } else {
-               diag_set(OutOfMemory, nByte, "malloc", "p");
+       if (p == NULL) {
+               diag_set(OutOfMemory, nByte, "realloc", "p");
+               return NULL;
        }
+       p[0] = nByte;
+       p++;
        return (void *)p;
 }