diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2023-02-15 16:30:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-02-15 16:30:53 +0100 |
| commit | b45ed284a69cdbffac61bdcf74bf86fa7b7391a4 (patch) | |
| tree | de26ce8e0a5aa40889e889d758e3a3a98b9f71a8 /storage/connect/json.cpp | |
| parent | cc182aca9352fb7efde0deb0a83844e1d5f0c64c (diff) | |
| parent | cafba8761af55ae16cc69c9b53a341340a845b36 (diff) | |
| download | mariadb-git-bb-11.0-all-builders.tar.gz | |
Merge branch '10.11' into 11.0bb-11.0-all-builders
Diffstat (limited to 'storage/connect/json.cpp')
| -rw-r--r-- | storage/connect/json.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp index 4c78a9f1ecc..4490f179d24 100644 --- a/storage/connect/json.cpp +++ b/storage/connect/json.cpp @@ -10,6 +10,7 @@ /* Include relevant sections of the MariaDB header file. */ /***********************************************************************/ #include <my_global.h> +#include <m_string.h> /***********************************************************************/ /* Include application header files: */ @@ -268,7 +269,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char* fn, int pretty) { jdp->dfp = GetDefaultPrec(); if (!jsp) { - strcpy(g->Message, "Null json tree"); + safe_strcpy(g->Message, sizeof(g->Message), "Null json tree"); throw 1; } else if (!fn) { // Serialize to a string @@ -276,9 +277,8 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char* fn, int pretty) { b = pretty == 1; } else { if (!(fs = fopen(fn, "wb"))) { - snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR), - "w", (int)errno, fn); - strcat(strcat(g->Message, ": "), strerror(errno)); + snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR) ": %s", + "w", (int)errno, fn, strerror(errno)); throw 2; } else if (pretty >= 2) { // Serialize to a pretty file |