summaryrefslogtreecommitdiff
path: root/storage/connect/json.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2016-09-05 12:47:52 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2016-09-05 12:47:52 +0200
commita4623b516014362558c90dc9d539f1db7b229b9c (patch)
tree0b6ee31944f7243f604e06b9456b2134d172f8c5 /storage/connect/json.cpp
parent55fb72d8694fe99e96f1b95b5f63aab5ff7a86dd (diff)
downloadmariadb-git-a4623b516014362558c90dc9d539f1db7b229b9c.tar.gz
- Fix MDEV-10496. Memory leak in discovery
modified: storage/connect/ha_connect.cc - Fix wrong lrecl calculation for virtual columns modified: storage/connect/reldef.cpp - Typo modified: storage/connect/jdbconn.cpp modified: storage/connect/json.cpp
Diffstat (limited to 'storage/connect/json.cpp')
-rw-r--r--storage/connect/json.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
index d99a021cdc9..c45630129f1 100644
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -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;