mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to fix failing tests

Browse source
This commit is contained in:
Olivier Bertrand 2020-11-05 23:04:37 +01:00
parent addb28f62d
commit a4e999eec5
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
storage/connect/json.cpp
View file

@ -1053,7 +1053,7 @@ PSZ JOBJECT::GetText(PGLOBAL g, PSZ text)
return text;
if (!text) {
text = (char*)PlugSubAlloc(g, NULL, 512); // TODO: get size
text = (PSZ)malloc(1024); // TODO: get size
text[0] = 0;
n = 1;
} else
@ -1079,10 +1079,14 @@ PSZ JOBJECT::GetText(PGLOBAL g, PSZ text)
} else for (PJPR jp = First; jp; jp = jp->Next)
jp->Val->GetText(g, text);
//if (n)
// PlugSubAlloc(g, NULL, strlen(text) + 1);
if (n) {
PSZ txt = (PSZ)PlugSubAlloc(g, NULL, strlen(text));
strcpy(txt, text + 1); // Remove leading blank
free(text);
text = txt;
} // endif n
return text + n;
return text;
} // end of GetText;
/***********************************************************************/
@ -1290,7 +1294,7 @@ PSZ JARRAY::GetText(PGLOBAL g, PSZ text)
PJVAL jp;
if (!text) {
text = (char*)PlugSubAlloc(g, NULL, 512);
text = (char*)malloc(1024); // Should be large enough
text[0] = 0;
n = 1;
} else
@ -1299,10 +1303,14 @@ PSZ JARRAY::GetText(PGLOBAL g, PSZ text)
for (jp = First; jp; jp = jp->Next)
jp->GetText(g, text);
//if (n)
// PlugSubAlloc(g, NULL, strlen(text) + 1);
if (n) {
PSZ txt = (PSZ)PlugSubAlloc(g, NULL, strlen(text));
strcpy(txt, text + 1); // Remove leading blank
free(text);
text = txt;
} // endif n
return text + n;
return text;
} // end of GetText;
/***********************************************************************/