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 MDEV-10496. Memory leak in discovery

Browse Source 
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mycat.cc

- Fix wrong lrecl calculation for virtual columns
  modified:   storage/connect/reldef.cpp

- Typo
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/json.cpp
This commit is contained in:
Olivier Bertrand
2016-09-05 13:18:04 +02:00
parent a2934d2710
commit 213765cc22
5 changed files with 61 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/json.cpp
View File

@@ -595,7 +595,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty)
fputs(EL, fs);
fclose(fs);
str = (err) ? NULL : strcpy(g->Message, "Ok");
} else if (!err) {
} else if (!err) {
str = ((JOUTSTR*)jp)->Strp;
jp->WriteChr('\0');
PlugSubAlloc(g, NULL, ((JOUTSTR*)jp)->N);
@@ -767,7 +767,7 @@ bool JOUTSTR::Escape(const char *s)
{
WriteChr('"');
for (unsigned int i = 0; i < strlen(s); i++)
for (unsigned int i = 0; s[i]; i++)
switch (s[i]) {
case '"':
case '\\':
@@ -816,7 +816,7 @@ bool JOUTFILE::Escape(const char *s)
// This is temporary
fputc('"', Stream);
for (unsigned int i = 0; i < strlen(s); i++)
for (unsigned int i = 0; s[i]; i++)
switch (s[i]) {
case '"': fputs("\\\"", Stream); break;
case '\\': fputs("\\\\", Stream); break;