diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-07-27 11:02:57 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-07-27 11:02:57 +0200 |
| commit | 3bb36e949534fc4a24d68d4297663ae8b80ba336 (patch) | |
| tree | 09907f6c2e82d718f261323075ffb33cb350fef7 /storage/connect/libdoc.cpp | |
| parent | 9a897335eb4387980aed7698b832a893dbaa3d81 (diff) | |
| parent | bd935a41060199a17019453d6e187e8edd7929ba (diff) | |
| download | mariadb-git-3bb36e949534fc4a24d68d4297663ae8b80ba336.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'storage/connect/libdoc.cpp')
| -rw-r--r-- | storage/connect/libdoc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp index 61921555ad7..d9305a59a3c 100644 --- a/storage/connect/libdoc.cpp +++ b/storage/connect/libdoc.cpp @@ -661,7 +661,7 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) if (xmlXPathRegisterNs(Ctxp, BAD_CAST nsp->Prefix, BAD_CAST nsp->Uri)) { - sprintf(g->Message, MSG(REGISTER_ERR), nsp->Prefix, nsp->Uri); + snprintf(g->Message, sizeof(g->Message), MSG(REGISTER_ERR), nsp->Prefix, nsp->Uri); if (trace(1)) htrc("Ns error: %-.256s\n", g->Message); @@ -703,7 +703,7 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) // Evaluate table xpath if (!(Xop = xmlXPathEval(BAD_CAST xp, Ctxp))) { - sprintf(g->Message, MSG(XPATH_EVAL_ERR), xp); + snprintf(g->Message, sizeof(g->Message), MSG(XPATH_EVAL_ERR), xp); if (trace(1)) htrc("Path error: %-.256s\n", g->Message); @@ -882,7 +882,7 @@ RCODE XML2NODE::GetContent(PGLOBAL g, char *buf, int len) } // endif p1 } else { - sprintf(g->Message, "Truncated %-.256s content", Nodep->name); + snprintf(g->Message, sizeof(g->Message), "Truncated %-.256s content", Nodep->name); rc = RC_INFO; } // endif len @@ -1260,7 +1260,7 @@ RCODE XML2ATTR::GetText(PGLOBAL g, char *buf, int len) if (strlen((char*)txt) >= (unsigned)len) { memcpy(buf, txt, len - 1); buf[len - 1] = 0; - sprintf(g->Message, "Truncated %-.256s content", Atrp->name); + snprintf(g->Message, sizeof(g->Message), "Truncated %-.256s content", Atrp->name); rc = RC_INFO; } else strcpy(buf, (const char*)txt); |