database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix memory error when a plain string argument is parsed.

Browse Source 
Parsing memory, not added in CalcLen, is added in CheckMemory.
Adding also the file length.
  modified:   storage/connect/jsonudf.cpp
This commit is contained in:
Olivier Bertrand
2015-12-05 21:04:02 +01:00
parent a6b8bfcafd
commit d059dd7368
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
storage/connect/jsonudf.cpp
View File

@@ -1426,10 +1426,11 @@ static my_bool CheckMemory(PGLOBAL g, UDF_INIT *initid, UDF_ARGS *args, uint n,
char *p = args->args[0]; char *p = args->args[0];
// Is this a file name? // Is this a file name?
if (strchr("[{ \t\r\n", *p) || !(len = GetFileLength(p))) if (!strchr("[{ \t\r\n", *p) && (len = GetFileLength(p)))
len = args->lengths[0]; ml += len * (M + 1);
else
ml += args->lengths[0] * M;
ml += len * M; // Was not done in CalcLen
} // endif b } // endif b
if (ml > g->Sarea_Size) { if (ml > g->Sarea_Size) {