diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-17 14:58:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-17 14:58:11 +0200 |
| commit | 2543673dd22782f59299fd2e72179601892bd967 (patch) | |
| tree | b73641bd88c9d1572203c75da618fce1937518e8 /strings/json_normalize.c | |
| parent | 4e5b771e980edfdad5c5414aa62c81d409d585a4 (diff) | |
| parent | ef911553f442cbb1baaac2af44c38b54fd058c41 (diff) | |
| download | mariadb-git-bb-11.1-release.tar.gz | |
Merge branch '11.0' into 11.1bb-11.1-release
Diffstat (limited to 'strings/json_normalize.c')
| -rw-r--r-- | strings/json_normalize.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/strings/json_normalize.c b/strings/json_normalize.c index 0b7f172dae6..2c66c712e81 100644 --- a/strings/json_normalize.c +++ b/strings/json_normalize.c @@ -147,13 +147,16 @@ json_normalize_number(DYNAMIC_STRING *out, const char *str, size_t str_len) magnitude = (long)(j - 1); - /* skip the . */ - if (str[i] == '.') - ++i; + if (i < str_len) + { + /* skip the . */ + if (str[i] == '.') + ++i; - /* grab rest of digits before the E */ - for (; i < str_len && str[i] != 'e' && str[i] != 'E'; ++i) - buf[j++] = str[i]; + /* grab rest of digits before the E */ + for (; i < str_len && str[i] != 'e' && str[i] != 'E'; ++i) + buf[j++] = str[i]; + } /* trim trailing zeros */ for (k = j - 1; k && buf[k] == '0'; --k, --j) @@ -187,7 +190,7 @@ json_normalize_number(DYNAMIC_STRING *out, const char *str, size_t str_len) err|= dynstr_append_mem(out, STRING_WITH_LEN("E")); - if (str[i] == 'e' || str[i] == 'E') + if (i < str_len && (str[i] == 'e' || str[i] == 'E')) { char *endptr = NULL; /* skip the [eE] */ |