Skip to content

M
MariaDB
Commit fc6e8a3d authored by Mikhail Chalov's avatar Mikhail Chalov Committed by Andrew Hutchings
Browse files
Options

Minimize unsafe C functions usage - replace strcat() and strcpy() 

Similar to 567b6812 continue to replace use of strcat() and
strcpy() with safer options strncat() and strncpy().

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the BSD-new
license. I am contributing on behalf of my employer Amazon Web Services
parent 854e8b18
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 148 deletions
storage/connect/reldef.cpp
View file @ fc6e8a3d
...@@ -91,11 +91,11 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char* tab, char* db, bool info) ...@@ -91,11 +91,11 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char* tab, char* db, bool info)
/* directories are used (to make this even remotely secure). */ /* directories are used (to make this even remotely secure). */
/*********************************************************************/ /*********************************************************************/
if (check_valid_path(module, strlen(module))) { if (check_valid_path(module, strlen(module))) {
strcpy(g->Message, "Module cannot contain a path"); safe_strcpy(g->Message, sizeof(g->Message), "Module cannot contain a path");
return NULL; return NULL;
} }
else if (strlen(subtype)+1+3 >= sizeof(getname)) { else if (strlen(subtype)+1+3 >= sizeof(getname)) {
strcpy(g->Message, "Subtype string too long"); safe_strcpy(g->Message, sizeof(g->Message), "Subtype string too long");
return NULL; return NULL;
} }
else else
...@@ -118,7 +118,8 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char* tab, char* db, bool info) ...@@ -118,7 +118,8 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char* tab, char* db, bool info)
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0, FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
(LPTSTR)buf, sizeof(buf), NULL); (LPTSTR)buf, sizeof(buf), NULL);
strcat(strcat(g->Message, ": "), buf); safe_strcat(g->Message, sizeof(g->Message), ": ");
safe_strcat(g->Message, sizeof(g->Message), buf);
return NULL; return NULL;
} // endif hDll } // endif hDll
...@@ -281,7 +282,7 @@ char *RELDEF::GetStringCatInfo(PGLOBAL g, PCSZ what, PCSZ sdef) ...@@ -281,7 +282,7 @@ char *RELDEF::GetStringCatInfo(PGLOBAL g, PCSZ what, PCSZ sdef)
if (IsFileType(GetTypeID(ftype))) { if (IsFileType(GetTypeID(ftype))) {
name= Hc->GetPartName(); name= Hc->GetPartName();
sval= (char*)PlugSubAlloc(g, NULL, strlen(name) + 12); sval= (char*)PlugSubAlloc(g, NULL, strlen(name) + 12);
strcat(strcpy(sval, name), "."); snprintf(sval, strlen(name) + 12, "%s.", name);
n= strlen(sval); n= strlen(sval);
// Fold ftype to lower case // Fold ftype to lower case
...@@ -622,12 +623,11 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g) ...@@ -622,12 +623,11 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
/* directories are used (to make this even remotely secure). */ /* directories are used (to make this even remotely secure). */
/*********************************************************************/ /*********************************************************************/
if (check_valid_path(Module, strlen(Module))) { if (check_valid_path(Module, strlen(Module))) {
strcpy(g->Message, "Module cannot contain a path"); safe_strcpy(g->Message, sizeof(g->Message), "Module cannot contain a path");
return NULL; return NULL;
} else } else
// PlugSetPath(soname, Module, GetPluginDir()); // Crashes on Fedora // PlugSetPath(soname, Module, GetPluginDir()); // Crashes on Fedora
strncat(strcpy(soname, GetPluginDir()), Module, snprintf(soname, sizeof(soname), "%s%s", GetPluginDir(), Module);
sizeof(soname) - strlen(soname) - 1);
#if defined(_WIN32) #if defined(_WIN32)
// Is the DLL already loaded? // Is the DLL already loaded?
...@@ -641,7 +641,8 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g) ...@@ -641,7 +641,8 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0, FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
(LPTSTR)buf, sizeof(buf), NULL); (LPTSTR)buf, sizeof(buf), NULL);
strcat(strcat(g->Message, ": "), buf); safe_strcat(g->Message, sizeof(g->Message), ": ");
safe_strcat(g->Message, sizeof(g->Message), buf);
return NULL; return NULL;
} // endif hDll } // endif hDll
...@@ -661,7 +662,8 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g) ...@@ -661,7 +662,8 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0, FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
(LPTSTR)buf, sizeof(buf), NULL); (LPTSTR)buf, sizeof(buf), NULL);
strcat(strcat(g->Message, ": "), buf); safe_strcat(g->Message, sizeof(g->Message), ": ");
safe_strcat(g->Message, sizeof(g->Message), buf);
FreeLibrary((HMODULE)Hdll); FreeLibrary((HMODULE)Hdll);
return NULL; return NULL;
} // endif getdef } // endif getdef
...@@ -810,7 +812,7 @@ PTDB OEMDEF::GetTable(PGLOBAL g, MODE mode) ...@@ -810,7 +812,7 @@ PTDB OEMDEF::GetTable(PGLOBAL g, MODE mode)
else else
txfp = new(g) ZLBFAM(defp); txfp = new(g) ZLBFAM(defp);
#else // !GZ_SUPPORT #else // !GZ_SUPPORT
strcpy(g->Message, "Compress not supported"); safe_strcpy(g->Message, sizeof(g->Message), "Compress not supported");
return NULL; return NULL;
#endif // !GZ_SUPPORT #endif // !GZ_SUPPORT
} else if (rfm == RECFM_VAR) { } else if (rfm == RECFM_VAR) {
...@@ -833,7 +835,7 @@ PTDB OEMDEF::GetTable(PGLOBAL g, MODE mode) ...@@ -833,7 +835,7 @@ PTDB OEMDEF::GetTable(PGLOBAL g, MODE mode)
else else
txfp = new(g) VCTFAM((PVCTDEF)defp); txfp = new(g) VCTFAM((PVCTDEF)defp);
#else // !VCT_SUPPORT #else // !VCT_SUPPORT
strcpy(g->Message, "VCT no more supported"); safe_strcpy(g->Message, sizeof(g->Message), "VCT no more supported");
return NULL; return NULL;
#endif // !VCT_SUPPORT #endif // !VCT_SUPPORT
} // endif's } // endif's
...@@ -924,7 +926,7 @@ int COLDEF::Define(PGLOBAL g, void *, PCOLINFO cfp, int poff) ...@@ -924,7 +926,7 @@ int COLDEF::Define(PGLOBAL g, void *, PCOLINFO cfp, int poff)
return -1; return -1;
} // endswitch } // endswitch
strcpy(F.Type, GetFormatType(Buf_Type)); safe_strcpy(F.Type, sizeof(F.Type), GetFormatType(Buf_Type));
F.Length = cfp->Length; F.Length = cfp->Length;
F.Prec = cfp->Scale; F.Prec = cfp->Scale;
Offset = (cfp->Offset < 0) ? poff : cfp->Offset; Offset = (cfp->Offset < 0) ? poff : cfp->Offset;
......
storage/connect/tabbson.cpp
View file @ fc6e8a3d
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "checklvl.h" #include "checklvl.h"
#include "resource.h" #include "resource.h"
#include "mycat.h" // for FNC_COL #include "mycat.h" // for FNC_COL
#include "m_string.h"
/***********************************************************************/ /***********************************************************************/
/* This should be an option. */ /* This should be an option. */
...@@ -80,7 +81,7 @@ PQRYRES BSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info) ...@@ -80,7 +81,7 @@ PQRYRES BSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info)
} // endif info } // endif info
if (GetIntegerTableOption(g, topt, "Multiple", 0)) { if (GetIntegerTableOption(g, topt, "Multiple", 0)) {
strcpy(g->Message, "Cannot find column definition for multiple table"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot find column definition for multiple table");
return NULL; return NULL;
} // endif Multiple } // endif Multiple
...@@ -206,7 +207,7 @@ int BSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt) ...@@ -206,7 +207,7 @@ int BSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
tdp->Uri = (dsn && *dsn ? dsn : NULL); tdp->Uri = (dsn && *dsn ? dsn : NULL);
if (!tdp->Fn && !tdp->Uri) { if (!tdp->Fn && !tdp->Uri) {
strcpy(g->Message, MSG(MISSING_FNAME)); safe_strcpy(g->Message, sizeof(g->Message), MSG(MISSING_FNAME));
return 0; return 0;
} else } else
topt->subtype = NULL; topt->subtype = NULL;
...@@ -318,7 +319,7 @@ int BSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt) ...@@ -318,7 +319,7 @@ int BSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
switch (tjnp->ReadDB(g)) { switch (tjnp->ReadDB(g)) {
case RC_EF: case RC_EF:
strcpy(g->Message, "Void json table"); safe_strcpy(g->Message, sizeof(g->Message), "Void json table");
case RC_FX: case RC_FX:
goto err; goto err;
default: default:
...@@ -328,7 +329,7 @@ int BSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt) ...@@ -328,7 +329,7 @@ int BSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
} // endif pretty } // endif pretty
if (!(row = (jsp) ? bp->GetObject(jsp) : NULL)) { if (!(row = (jsp) ? bp->GetObject(jsp) : NULL)) {
strcpy(g->Message, "Can only retrieve columns from object rows"); safe_strcpy(g->Message, sizeof(g->Message), "Can only retrieve columns from object rows");
goto err; goto err;
} // endif row } // endif row
...@@ -405,7 +406,7 @@ bool BSONDISC::Find(PGLOBAL g, PBVAL jvp, PCSZ key, int j) ...@@ -405,7 +406,7 @@ bool BSONDISC::Find(PGLOBAL g, PBVAL jvp, PCSZ key, int j)
if (jvp && !bp->IsJson(jvp)) { if (jvp && !bp->IsJson(jvp)) {
if (JsonAllPath() && !fmt[bf]) if (JsonAllPath() && !fmt[bf])
strcat(fmt, colname); safe_strcat(fmt, sizeof(fmt), colname);
jcol.Type = (JTYP)jvp->Type; jcol.Type = (JTYP)jvp->Type;
...@@ -439,7 +440,7 @@ bool BSONDISC::Find(PGLOBAL g, PBVAL jvp, PCSZ key, int j) ...@@ -439,7 +440,7 @@ bool BSONDISC::Find(PGLOBAL g, PBVAL jvp, PCSZ key, int j)
jcol.Cbn = true; jcol.Cbn = true;
} else if (j < lvl && !Stringified(strfy, colname)) { } else if (j < lvl && !Stringified(strfy, colname)) {
if (!fmt[bf]) if (!fmt[bf])
strcat(fmt, colname); safe_strcat(fmt, sizeof(fmt), colname);
p = fmt + strlen(fmt); p = fmt + strlen(fmt);
jsp = jvp; jsp = jvp;
...@@ -510,11 +511,11 @@ bool BSONDISC::Find(PGLOBAL g, PBVAL jvp, PCSZ key, int j) ...@@ -510,11 +511,11 @@ bool BSONDISC::Find(PGLOBAL g, PBVAL jvp, PCSZ key, int j)
} else if (lvl >= 0) { } else if (lvl >= 0) {
if (Stringified(strfy, colname)) { if (Stringified(strfy, colname)) {
if (!fmt[bf]) if (!fmt[bf])
strcat(fmt, colname); safe_strcat(fmt, sizeof(fmt), colname);
strcat(fmt, ".*"); safe_strcat(fmt, sizeof(fmt), ".*");
} else if (JsonAllPath() && !fmt[bf]) } else if (JsonAllPath() && !fmt[bf])
strcat(fmt, colname); safe_strcat(fmt, sizeof(fmt), colname);
jcol.Type = TYPE_STRG; jcol.Type = TYPE_STRG;
jcol.Len = sz; jcol.Len = sz;
...@@ -961,7 +962,7 @@ PVAL BCUTIL::ExpandArray(PGLOBAL g, PBVAL arp, int n) ...@@ -961,7 +962,7 @@ PVAL BCUTIL::ExpandArray(PGLOBAL g, PBVAL arp, int n)
} // endif ars } // endif ars
if (!(bvp = GetArrayValue(arp, (nodes[n].Rx = nodes[n].Nx)))) { if (!(bvp = GetArrayValue(arp, (nodes[n].Rx = nodes[n].Nx)))) {
strcpy(g->Message, "Logical error expanding array"); safe_strcpy(g->Message, sizeof(g->Message), "Logical error expanding array");
throw 666; throw 666;
} // endif jvp } // endif jvp
...@@ -1146,7 +1147,7 @@ PBVAL BCUTIL::GetRow(PGLOBAL g) ...@@ -1146,7 +1147,7 @@ PBVAL BCUTIL::GetRow(PGLOBAL g)
} else if (row->Type == TYPE_JAR) { } else if (row->Type == TYPE_JAR) {
AddArrayValue(row, (nwr = NewVal(type))); AddArrayValue(row, (nwr = NewVal(type)));
} else { } else {
strcpy(g->Message, "Wrong type when writing new row"); safe_strcpy(g->Message, sizeof(g->Message), "Wrong type when writing new row");
nwr = NULL; nwr = NULL;
} // endif's } // endif's
...@@ -1255,7 +1256,7 @@ PTDB BSONDEF::GetTable(PGLOBAL g, MODE m) ...@@ -1255,7 +1256,7 @@ PTDB BSONDEF::GetTable(PGLOBAL g, MODE m)
// Allocate the parse work memory // Allocate the parse work memory
G = PlugInit(NULL, (size_t)Lrecl * (Pretty < 0 ? 3 : 5)); G = PlugInit(NULL, (size_t)Lrecl * (Pretty < 0 ? 3 : 5));
} else { } else {
strcpy(g->Message, "LRECL is not defined"); safe_strcpy(g->Message, sizeof(g->Message), "LRECL is not defined");
return NULL; return NULL;
} // endif Lrecl } // endif Lrecl
...@@ -1295,7 +1296,7 @@ PTDB BSONDEF::GetTable(PGLOBAL g, MODE m) ...@@ -1295,7 +1296,7 @@ PTDB BSONDEF::GetTable(PGLOBAL g, MODE m)
} else if (m == MODE_INSERT) { } else if (m == MODE_INSERT) {
txfp = new(g) ZIPFAM(this); txfp = new(g) ZIPFAM(this);
} else { } else {
strcpy(g->Message, "UPDATE/DELETE not supported for ZIP"); safe_strcpy(g->Message, sizeof(g->Message), "UPDATE/DELETE not supported for ZIP");
return NULL; return NULL;
} // endif's m } // endif's m
#else // !ZIP_SUPPORT #else // !ZIP_SUPPORT
...@@ -1325,10 +1326,10 @@ PTDB BSONDEF::GetTable(PGLOBAL g, MODE m) ...@@ -1325,10 +1326,10 @@ PTDB BSONDEF::GetTable(PGLOBAL g, MODE m)
if (m == MODE_READ || m == MODE_ANY || m == MODE_ALTER) { if (m == MODE_READ || m == MODE_ANY || m == MODE_ALTER) {
txfp = new(g) UNZFAM(this); txfp = new(g) UNZFAM(this);
} else if (m == MODE_INSERT) { } else if (m == MODE_INSERT) {
strcpy(g->Message, "INSERT supported only for zipped JSON when pretty=0"); safe_strcpy(g->Message, sizeof(g->Message), "INSERT supported only for zipped JSON when pretty=0");
return NULL; return NULL;
} else { } else {
strcpy(g->Message, "UPDATE/DELETE not supported for ZIP"); safe_strcpy(g->Message, sizeof(g->Message), "UPDATE/DELETE not supported for ZIP");
return NULL; return NULL;
} // endif's m } // endif's m
#else // !ZIP_SUPPORT #else // !ZIP_SUPPORT
...@@ -1661,7 +1662,7 @@ bool TDBBSN::PrepareWriting(PGLOBAL g) ...@@ -1661,7 +1662,7 @@ bool TDBBSN::PrepareWriting(PGLOBAL g)
strcat(s, ","); strcat(s, ",");
if ((signed)strlen(s) > Lrecl) { if ((signed)strlen(s) > Lrecl) {
strncpy(To_Line, s, Lrecl); safe_strcpy(To_Line, Lrecl, s);
snprintf(g->Message, sizeof(g->Message), "Line truncated (lrecl=%d)", Lrecl); snprintf(g->Message, sizeof(g->Message), "Line truncated (lrecl=%d)", Lrecl);
return PushWarning(g, this); return PushWarning(g, this);
} else } else
...@@ -1764,7 +1765,7 @@ bool BSONCOL::CheckExpand(PGLOBAL g, int i, PSZ nm, bool b) ...@@ -1764,7 +1765,7 @@ bool BSONCOL::CheckExpand(PGLOBAL g, int i, PSZ nm, bool b)
Xpd = true; // Expandable object Xpd = true; // Expandable object
Nodes[i].Op = OP_EXP; Nodes[i].Op = OP_EXP;
} else if (b) { } else if (b) {
strcpy(g->Message, "Cannot expand more than one branch"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot expand more than one branch");
return true; return true;
} // endif Xcol } // endif Xcol
...@@ -1975,7 +1976,7 @@ bool BSONCOL::ParseJpath(PGLOBAL g) ...@@ -1975,7 +1976,7 @@ bool BSONCOL::ParseJpath(PGLOBAL g)
if (SetArrayOptions(g, p, i, Nodes[i - 1].Key)) if (SetArrayOptions(g, p, i, Nodes[i - 1].Key))
return true; return true;
else if (Xpd && Tbp->Mode == MODE_DELETE) { else if (Xpd && Tbp->Mode == MODE_DELETE) {
strcpy(g->Message, "Cannot delete expanded columns"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot delete expanded columns");
return true; return true;
} // endif Xpd } // endif Xpd
...@@ -2096,7 +2097,7 @@ void BSONCOL::ReadColumn(PGLOBAL g) ...@@ -2096,7 +2097,7 @@ void BSONCOL::ReadColumn(PGLOBAL g)
void BSONCOL::WriteColumn(PGLOBAL g) void BSONCOL::WriteColumn(PGLOBAL g)
{ {
if (Xpd && Tbp->Pretty < 2) { if (Xpd && Tbp->Pretty < 2) {
strcpy(g->Message, "Cannot write expanded column when Pretty is not 2"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot write expanded column when Pretty is not 2");
throw 666; throw 666;
} // endif Xpd } // endif Xpd
...@@ -2126,7 +2127,7 @@ void BSONCOL::WriteColumn(PGLOBAL g) ...@@ -2126,7 +2127,7 @@ void BSONCOL::WriteColumn(PGLOBAL g)
char *s = Value->GetCharValue(); char *s = Value->GetCharValue();
if (!(jsp = Cp->ParseJson(g, s, strlen(s)))) { if (!(jsp = Cp->ParseJson(g, s, strlen(s)))) {
strcpy(g->Message, s); safe_strcpy(g->Message, sizeof(g->Message), s);
throw 666; throw 666;
} // endif jsp } // endif jsp
...@@ -2312,7 +2313,7 @@ int TDBBSON::MakeDocument(PGLOBAL g) ...@@ -2312,7 +2313,7 @@ int TDBBSON::MakeDocument(PGLOBAL g)
if (!a && *p && *p != '[' && !IsNum(p)) { if (!a && *p && *p != '[' && !IsNum(p)) {
// obj is a key // obj is a key
if (jsp->Type != TYPE_JOB) { if (jsp->Type != TYPE_JOB) {
strcpy(g->Message, "Table path does not match the json file"); safe_strcpy(g->Message, sizeof(g->Message), "Table path does not match the json file");
return RC_FX; return RC_FX;
} // endif Type } // endif Type
...@@ -2338,7 +2339,7 @@ int TDBBSON::MakeDocument(PGLOBAL g) ...@@ -2338,7 +2339,7 @@ int TDBBSON::MakeDocument(PGLOBAL g)
} // endif p } // endif p
if (jsp->Type != TYPE_JAR) { if (jsp->Type != TYPE_JAR) {
strcpy(g->Message, "Table path does not match the json file"); safe_strcpy(g->Message, sizeof(g->Message), "Table path does not match the json file");
return RC_FX; return RC_FX;
} // endif Type } // endif Type
...@@ -2432,7 +2433,7 @@ void TDBBSON::ResetSize(void) ...@@ -2432,7 +2433,7 @@ void TDBBSON::ResetSize(void)
int TDBBSON::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool) int TDBBSON::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool)
{ {
if (pxdf) { if (pxdf) {
strcpy(g->Message, "JSON not indexable when pretty = 2"); safe_strcpy(g->Message, sizeof(g->Message), "JSON not indexable when pretty = 2");
return RC_FX; return RC_FX;
} else } else
return RC_OK; return RC_OK;
......
storage/connect/tabdos.cpp
View file @ fc6e8a3d
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
#include "tabmul.h" #include "tabmul.h"
#include "array.h" #include "array.h"
#include "blkfil.h" #include "blkfil.h"
#include "m_string.h"
/***********************************************************************/ /***********************************************************************/
/* DB static variables. */ /* DB static variables. */
...@@ -258,7 +259,7 @@ bool DOSDEF::DeleteIndexFile(PGLOBAL g, PIXDEF pxdf) ...@@ -258,7 +259,7 @@ bool DOSDEF::DeleteIndexFile(PGLOBAL g, PIXDEF pxdf)
sep = GetBoolCatInfo("SepIndex", false); sep = GetBoolCatInfo("SepIndex", false);
if (!sep && pxdf) { if (!sep && pxdf) {
strcpy(g->Message, MSG(NO_RECOV_SPACE)); safe_strcpy(g->Message, sizeof(g->Message), MSG(NO_RECOV_SPACE));
return true; return true;
} // endif sep } // endif sep
...@@ -293,7 +294,8 @@ bool DOSDEF::DeleteIndexFile(PGLOBAL g, PIXDEF pxdf) ...@@ -293,7 +294,8 @@ bool DOSDEF::DeleteIndexFile(PGLOBAL g, PIXDEF pxdf)
for (; pxdf; pxdf = pxdf->GetNext()) { for (; pxdf; pxdf = pxdf->GetNext()) {
_splitpath(Ofn, drive, direc, fname, NULL); _splitpath(Ofn, drive, direc, fname, NULL);
strcat(strcat(fname, "_"), pxdf->GetName()); safe_strcat(fname, sizeof(fname), "_");
safe_strcat(fname, sizeof(fname), pxdf->GetName());
_makepath(filename, drive, direc, fname, ftype); _makepath(filename, drive, direc, fname, ftype);
PlugSetPath(filename, filename, GetPath()); PlugSetPath(filename, filename, GetPath());
#if defined(_WIN32) #if defined(_WIN32)
...@@ -312,7 +314,7 @@ bool DOSDEF::DeleteIndexFile(PGLOBAL g, PIXDEF pxdf) ...@@ -312,7 +314,7 @@ bool DOSDEF::DeleteIndexFile(PGLOBAL g, PIXDEF pxdf)
} else { // !sep } else { // !sep
// Drop all indexes, delete the common file // Drop all indexes, delete the common file
PlugSetPath(filename, Ofn, GetPath()); PlugSetPath(filename, Ofn, GetPath());
strcat(PlugRemoveType(filename, filename), ftype); safe_strcat(PlugRemoveType(filename, filename), sizeof(filename), ftype);
#if defined(_WIN32) #if defined(_WIN32)
if (!DeleteFile(filename)) if (!DeleteFile(filename))
rc = (GetLastError() != ERROR_FILE_NOT_FOUND); rc = (GetLastError() != ERROR_FILE_NOT_FOUND);
...@@ -365,7 +367,7 @@ PTDB DOSDEF::GetTable(PGLOBAL g, MODE mode) ...@@ -365,7 +367,7 @@ PTDB DOSDEF::GetTable(PGLOBAL g, MODE mode)
if (mode == MODE_READ || mode == MODE_ANY || mode == MODE_ALTER) { if (mode == MODE_READ || mode == MODE_ANY || mode == MODE_ALTER) {
txfp = new(g) UZDFAM(this); txfp = new(g) UZDFAM(this);
} else { } else {
strcpy(g->Message, "Zipped DBF tables are read only"); safe_strcpy(g->Message, sizeof(g->Message), "Zipped DBF tables are read only");
return NULL; return NULL;
} // endif's mode } // endif's mode
...@@ -386,7 +388,7 @@ PTDB DOSDEF::GetTable(PGLOBAL g, MODE mode) ...@@ -386,7 +388,7 @@ PTDB DOSDEF::GetTable(PGLOBAL g, MODE mode)
} else if (mode == MODE_INSERT) { } else if (mode == MODE_INSERT) {
txfp = new(g) ZIPFAM(this); txfp = new(g) ZIPFAM(this);
} else { } else {
strcpy(g->Message, "UPDATE/DELETE not supported for ZIP"); safe_strcpy(g->Message, sizeof(g->Message), "UPDATE/DELETE not supported for ZIP");
return NULL; return NULL;
} // endif's mode } // endif's mode
...@@ -397,7 +399,7 @@ PTDB DOSDEF::GetTable(PGLOBAL g, MODE mode) ...@@ -397,7 +399,7 @@ PTDB DOSDEF::GetTable(PGLOBAL g, MODE mode)
} else if (mode == MODE_INSERT) { } else if (mode == MODE_INSERT) {
txfp = new(g) ZPXFAM(this); txfp = new(g) ZPXFAM(this);
} else { } else {
strcpy(g->Message, "UPDATE/DELETE not supported for ZIP"); safe_strcpy(g->Message, sizeof(g->Message), "UPDATE/DELETE not supported for ZIP");
return NULL; return NULL;
} // endif's mode } // endif's mode
...@@ -654,7 +656,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g) ...@@ -654,7 +656,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g)
if ((nrec = defp->GetElemt()) < 2) { if ((nrec = defp->GetElemt()) < 2) {
if (!To_Def->Partitioned()) { if (!To_Def->Partitioned()) {
// This may be wrong to do in some cases // This may be wrong to do in some cases
strcpy(g->Message, MSG(TABLE_NOT_OPT)); safe_strcpy(g->Message, sizeof(g->Message), MSG(TABLE_NOT_OPT));
return RC_INFO; // Not to be optimized return RC_INFO; // Not to be optimized
} else } else
return RC_OK; return RC_OK;
...@@ -674,7 +676,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g) ...@@ -674,7 +676,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g)
if ((block = (int)((MaxSize + (int)nrec - 1) / (int)nrec)) < 2) { if ((block = (int)((MaxSize + (int)nrec - 1) / (int)nrec)) < 2) {
// This may be wrong to do in some cases // This may be wrong to do in some cases
defp->RemoveOptValues(g); defp->RemoveOptValues(g);
strcpy(g->Message, MSG(TABLE_NOT_OPT)); safe_strcpy(g->Message, sizeof(g->Message), MSG(TABLE_NOT_OPT));
return RC_INFO; // Not to be optimized return RC_INFO; // Not to be optimized
} // endif block } // endif block
...@@ -757,7 +759,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g) ...@@ -757,7 +759,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g)
// No optimised columns. Still useful for blocked variable tables. // No optimised columns. Still useful for blocked variable tables.
if (!colp && defp->Recfm != RECFM_VAR) { if (!colp && defp->Recfm != RECFM_VAR) {
strcpy(g->Message, "No optimised columns"); safe_strcpy(g->Message, sizeof(g->Message), "No optimised columns");
return RC_INFO; return RC_INFO;
} // endif colp } // endif colp
...@@ -787,7 +789,8 @@ int TDBDOS::MakeBlockValues(PGLOBAL g) ...@@ -787,7 +789,8 @@ int TDBDOS::MakeBlockValues(PGLOBAL g)
/*********************************************************************/ /*********************************************************************/
char *p = (char *)PlugSubAlloc(g, NULL, 24 + strlen(Name)); char *p = (char *)PlugSubAlloc(g, NULL, 24 + strlen(Name));
dup->Step = strcat(strcpy(p, MSG(OPTIMIZING)), Name); snprintf(p, 24 + strlen(Name), "%s%s", MSG(OPTIMIZING), Name);
dup->Step = p;
dup->ProgMax = GetProgMax(g); dup->ProgMax = GetProgMax(g);
dup->ProgCur = 0; dup->ProgCur = 0;
#endif // SOCKET_MODE || THREAD #endif // SOCKET_MODE || THREAD
...@@ -804,7 +807,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g) ...@@ -804,7 +807,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g)
} else { } else {
if (++curnum >= nrec) { if (++curnum >= nrec) {
if (++curblk >= block) { if (++curblk >= block) {
strcpy(g->Message, MSG(BAD_BLK_ESTIM)); safe_strcpy(g->Message, sizeof(g->Message), MSG(BAD_BLK_ESTIM));
goto err; goto err;
} else } else
curnum = 0; curnum = 0;
...@@ -832,7 +835,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g) ...@@ -832,7 +835,7 @@ int TDBDOS::MakeBlockValues(PGLOBAL g)
#if defined(PROG_INFO) #if defined(PROG_INFO)
if (!dup->Step) { if (!dup->Step) {
strcpy(g->Message, MSG(OPT_CANCELLED)); safe_strcpy(g->Message, sizeof(g->Message), MSG(OPT_CANCELLED));
goto err; goto err;
} else } else
dup->ProgCur = GetProgCur(); dup->ProgCur = GetProgCur();
...@@ -912,7 +915,8 @@ bool TDBDOS::SaveBlockValues(PGLOBAL g) ...@@ -912,7 +915,8 @@ bool TDBDOS::SaveBlockValues(PGLOBAL g)
if (!(opfile = fopen(filename, "wb"))) { if (!(opfile = fopen(filename, "wb"))) {
snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR), snprintf(g->Message, sizeof(g->Message), MSG(OPEN_MODE_ERROR),
"wb", (int)errno, filename); "wb", (int)errno, filename);
strcat(strcat(g->Message, ": "), strerror(errno)); safe_strcat(g->Message, sizeof(g->Message), ": ");
safe_strcat(g->Message, sizeof(g->Message), strerror(errno));
if (trace(1)) if (trace(1))
htrc("%s\n", g->Message); htrc("%s\n", g->Message);
...@@ -1227,7 +1231,8 @@ bool TDBDOS::GetDistinctColumnValues(PGLOBAL g, int nrec) ...@@ -1227,7 +1231,8 @@ bool TDBDOS::GetDistinctColumnValues(PGLOBAL g, int nrec)
/* Initialize progress information */ /* Initialize progress information */
/*********************************************************************/ /*********************************************************************/
p = (char *)PlugSubAlloc(g, NULL, 48 + strlen(Name)); p = (char *)PlugSubAlloc(g, NULL, 48 + strlen(Name));
dup->Step = strcat(strcpy(p, MSG(GET_DIST_VALS)), Name); snprintf(p, 48 + strlen(Name), "%s%s", MSG(GET_DIST_VALS), Name);
dup->Step = p;
dup->ProgMax = GetProgMax(g); dup->ProgMax = GetProgMax(g);
dup->ProgCur = 0; dup->ProgCur = 0;
...@@ -1239,12 +1244,12 @@ bool TDBDOS::GetDistinctColumnValues(PGLOBAL g, int nrec) ...@@ -1239,12 +1244,12 @@ bool TDBDOS::GetDistinctColumnValues(PGLOBAL g, int nrec)
#if defined(SOCKET_MODE) #if defined(SOCKET_MODE)
if (SendProgress(dup)) { if (SendProgress(dup)) {
strcpy(g->Message, MSG(OPT_CANCELLED)); safe_strcpy(g->Message, sizeof(g->Message), MSG(OPT_CANCELLED));
return true; return true;
} else } else
#elif defined(THREAD) #elif defined(THREAD)
if (!dup->Step) { if (!dup->Step) {
strcpy(g->Message, MSG(OPT_CANCELLED)); safe_strcpy(g->Message, sizeof(g->Message), MSG(OPT_CANCELLED));
return true; return true;
} else } else
#endif // THREAD #endif // THREAD
...@@ -1525,7 +1530,7 @@ PBF TDBDOS::CheckBlockFilari(PGLOBAL g, PXOB *arg, int op, bool *cnv) ...@@ -1525,7 +1530,7 @@ PBF TDBDOS::CheckBlockFilari(PGLOBAL g, PXOB *arg, int op, bool *cnv)
} else if (n == 8 || n == 14) { } else if (n == 8 || n == 14) {
if (n == 8 && ctype != TYPE_LIST) { if (n == 8 && ctype != TYPE_LIST) {
// Should never happen // Should never happen
strcpy(g->Message, "Block opt: bad constant"); safe_strcpy(g->Message, sizeof(g->Message), "Block opt: bad constant");
throw 99; throw 99;
} // endif Conv } // endif Conv
...@@ -1683,7 +1688,7 @@ int TDBDOS::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add) ...@@ -1683,7 +1688,7 @@ int TDBDOS::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add)
// Are we are called from CreateTable or CreateIndex? // Are we are called from CreateTable or CreateIndex?
if (pxdf) { if (pxdf) {
if (!add && dfp->GetIndx()) { if (!add && dfp->GetIndx()) {
strcpy(g->Message, MSG(INDX_EXIST_YET)); safe_strcpy(g->Message, sizeof(g->Message), MSG(INDX_EXIST_YET));
return RC_FX; return RC_FX;
} // endif To_Indx } // endif To_Indx
...@@ -1795,7 +1800,7 @@ int TDBDOS::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add) ...@@ -1795,7 +1800,7 @@ int TDBDOS::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add)
htrc("Exception %d: %s\n", n, g->Message); htrc("Exception %d: %s\n", n, g->Message);
rc = RC_FX; rc = RC_FX;
} catch (const char *msg) { } catch (const char *msg) {
strcpy(g->Message, msg); safe_strcpy(g->Message, sizeof(g->Message), msg);
rc = RC_FX; rc = RC_FX;
} // end catch } // end catch
...@@ -1829,7 +1834,7 @@ bool TDBDOS::InitialyzeIndex(PGLOBAL g, volatile PIXDEF xdp, bool sorted) ...@@ -1829,7 +1834,7 @@ bool TDBDOS::InitialyzeIndex(PGLOBAL g, volatile PIXDEF xdp, bool sorted)
PKPDEF kdp; PKPDEF kdp;
if (!xdp && !(xdp = To_Xdp)) { if (!xdp && !(xdp = To_Xdp)) {
strcpy(g->Message, "NULL dynamic index"); safe_strcpy(g->Message, sizeof(g->Message), "NULL dynamic index");
return true; return true;
} else } else
dynamic = To_Filter && xdp->IsUnique() && xdp->IsDynamic(); dynamic = To_Filter && xdp->IsUnique() && xdp->IsDynamic();
...@@ -1918,7 +1923,7 @@ bool TDBDOS::InitialyzeIndex(PGLOBAL g, volatile PIXDEF xdp, bool sorted) ...@@ -1918,7 +1923,7 @@ bool TDBDOS::InitialyzeIndex(PGLOBAL g, volatile PIXDEF xdp, bool sorted)
htrc("Exception %d: %s\n", n, g->Message); htrc("Exception %d: %s\n", n, g->Message);
brc = true; brc = true;
} catch (const char *msg) { } catch (const char *msg) {
strcpy(g->Message, msg); safe_strcpy(g->Message, sizeof(g->Message), msg);
brc = true; brc = true;
} // end catch } // end catch
...@@ -2679,38 +2684,38 @@ void DOSCOL::WriteColumn(PGLOBAL g) ...@@ -2679,38 +2684,38 @@ void DOSCOL::WriteColumn(PGLOBAL g)
if (Ldz || Nod || Dcm >= 0) { if (Ldz || Nod || Dcm >= 0) {
switch (Buf_Type) { switch (Buf_Type) {
case TYPE_SHORT: case TYPE_SHORT:
strcpy(fmt, (Ldz) ? "%0*hd" : "%*.hd"); safe_strcpy(fmt, sizeof(fmt), (Ldz) ? "%0*hd" : "%*.hd");
i = 0; i = 0;
if (Nod) if (Nod)
for (; i < Dcm; i++) for (; i < Dcm; i++)
strcat(fmt, "0"); safe_strcat(fmt, sizeof(fmt), "0");
len = sprintf(Buf, fmt, field - i, Value->GetShortValue()); len = sprintf(Buf, fmt, field - i, Value->GetShortValue());
break; break;
case TYPE_INT: case TYPE_INT:
strcpy(fmt, (Ldz) ? "%0*d" : "%*.d"); safe_strcpy(fmt, sizeof(fmt), (Ldz) ? "%0*d" : "%*.d");
i = 0; i = 0;
if (Nod) if (Nod)
for (; i < Dcm; i++) for (; i < Dcm; i++)
strcat(fmt, "0"); safe_strcat(fmt,sizeof(fmt), "0");
len = sprintf(Buf, fmt, field - i, Value->GetIntValue()); len = sprintf(Buf, fmt, field - i, Value->GetIntValue());
break; break;
case TYPE_TINY: case TYPE_TINY:
strcpy(fmt, (Ldz) ? "%0*d" : "%*.d"); safe_strcpy(fmt, sizeof(fmt), (Ldz) ? "%0*d" : "%*.d");
i = 0; i = 0;
if (Nod) if (Nod)
for (; i < Dcm; i++) for (; i < Dcm; i++)
strcat(fmt, "0"); safe_strcat(fmt, sizeof(fmt), "0");
len = sprintf(Buf, fmt, field - i, Value->GetTinyValue()); len = sprintf(Buf, fmt, field - i, Value->GetTinyValue());
break; break;
case TYPE_DOUBLE: case TYPE_DOUBLE:
case TYPE_DECIM: case TYPE_DECIM:
strcpy(fmt, (Ldz) ? "%0*.*lf" : "%*.*lf"); safe_strcpy(fmt, sizeof(fmt), (Ldz) ? "%0*.*lf" : "%*.*lf");
len = field + ((Nod && Dcm) ? 1 : 0); len = field + ((Nod && Dcm) ? 1 : 0);
snprintf(Buf, len + 1, fmt, len, Dcm, Value->GetFloatValue()); snprintf(Buf, len + 1, fmt, len, Dcm, Value->GetFloatValue());
len = strlen(Buf); len = strlen(Buf);
......
storage/connect/tabext.cpp
View file @ fc6e8a3d
...@@ -65,7 +65,7 @@ int CONDFIL::Init(PGLOBAL g, PHC hc) ...@@ -65,7 +65,7 @@ int CONDFIL::Init(PGLOBAL g, PHC hc)
while (alt) { while (alt) {
if (!(p = strchr(alt, '='))) { if (!(p = strchr(alt, '='))) {
strcpy(g->Message, "Invalid alias list"); safe_strcpy(g->Message, sizeof(g->Message), "Invalid alias list");
rc = RC_FX; rc = RC_FX;
break; break;
} // endif !p } // endif !p
...@@ -126,7 +126,7 @@ EXTDEF::EXTDEF(void) ...@@ -126,7 +126,7 @@ EXTDEF::EXTDEF(void)
bool EXTDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) bool EXTDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
{ {
if (g->Createas) { if (g->Createas) {
strcpy(g->Message, safe_strcpy(g->Message, sizeof(g->Message),
"Multiple-table UPDATE/DELETE commands are not supported"); "Multiple-table UPDATE/DELETE commands are not supported");
return true; return true;
} // endif multi } // endif multi
...@@ -349,7 +349,7 @@ bool TDBEXT::MakeSrcdef(PGLOBAL g) ...@@ -349,7 +349,7 @@ bool TDBEXT::MakeSrcdef(PGLOBAL g)
int n_placeholders = count_placeholders(Srcdef); int n_placeholders = count_placeholders(Srcdef);
if (n_placeholders < 0) if (n_placeholders < 0)
{ {
strcpy(g->Message, "MakeSQL: Wrong place holders specification"); safe_strcpy(g->Message, sizeof(g->Message), "MakeSQL: Wrong place holders specification");
return true; return true;
} }
...@@ -372,7 +372,7 @@ bool TDBEXT::MakeSrcdef(PGLOBAL g) ...@@ -372,7 +372,7 @@ bool TDBEXT::MakeSrcdef(PGLOBAL g)
Query = new(g)STRING(g, strlen(Srcdef) + strlen(fil1) + strlen(fil2)); Query = new(g)STRING(g, strlen(Srcdef) + strlen(fil1) + strlen(fil2));
Query->SetLength(sprintf(Query->GetStr(), Srcdef, fil2, fil1)); Query->SetLength(sprintf(Query->GetStr(), Srcdef, fil2, fil1));
} else { } else {
strcpy(g->Message, "MakeSQL: Wrong place holders specification"); safe_strcpy(g->Message, sizeof(g->Message), "MakeSQL: Wrong place holders specification");
return true; return true;
} // endif's ph } // endif's ph
...@@ -513,7 +513,7 @@ bool TDBEXT::MakeSQL(PGLOBAL g, bool cnt) ...@@ -513,7 +513,7 @@ bool TDBEXT::MakeSQL(PGLOBAL g, bool cnt)
len += ((Mode == MODE_READX) ? 256 : 1); len += ((Mode == MODE_READX) ? 256 : 1);
if (Query->IsTruncated()) { if (Query->IsTruncated()) {
strcpy(g->Message, "MakeSQL: Out of memory"); safe_strcpy(g->Message, sizeof(g->Message), "MakeSQL: Out of memory");
return true; return true;
} else } else
Query->Resize(len); Query->Resize(len);
...@@ -574,6 +574,7 @@ bool TDBEXT::MakeCommand(PGLOBAL g) ...@@ -574,6 +574,7 @@ bool TDBEXT::MakeCommand(PGLOBAL g)
bool qtd = Quoted > 0; bool qtd = Quoted > 0;
char q = qtd ? *Quote : ' '; char q = qtd ? *Quote : ' ';
int i = 0, k = 0; int i = 0, k = 0;
size_t stmt_sz = 0;
// Make a lower case copy of the originale query and change // Make a lower case copy of the originale query and change
// back ticks to the data source identifier quoting character // back ticks to the data source identifier quoting character
...@@ -585,26 +586,30 @@ bool TDBEXT::MakeCommand(PGLOBAL g) ...@@ -585,26 +586,30 @@ bool TDBEXT::MakeCommand(PGLOBAL g)
p[7] = 0; // Remove where clause p[7] = 0; // Remove where clause
Qrystr[(p - qrystr) + 7] = 0; Qrystr[(p - qrystr) + 7] = 0;
body = To_CondFil->Body; body = To_CondFil->Body;
stmt = (char*)PlugSubAlloc(g, NULL, strlen(qrystr) stmt_sz = strlen(qrystr) + strlen(body) + 64;
+ strlen(body) + 64);
} else } else
stmt = (char*)PlugSubAlloc(g, NULL, strlen(Qrystr) + 64); stmt_sz = strlen(Qrystr) + 64;
stmt = (char*)PlugSubAlloc(g, NULL, stmt_sz);
// Check whether the table name is equal to a keyword // Check whether the table name is equal to a keyword
// If so, it must be quoted in the original query // If so, it must be quoted in the original query
strlwr(strcat(strcat(strcpy(name, " "), Name), " ")); snprintf(name, sizeof(name), " %s ", Name);
strlwr(name);
if (strstr(" update delete low_priority ignore quick from ", name)) { if (strstr(" update delete low_priority ignore quick from ", name)) {
if (Quote) { if (Quote) {
strlwr(strcat(strcat(strcpy(name, Quote), Name), Quote)); snprintf(name, sizeof(name), "%s%s%s", Quote, Name, Quote);
strlwr(name);
k += 2; k += 2;
} else { } else {
strcpy(g->Message, "Quoted must be specified"); safe_strcpy(g->Message, sizeof(g->Message), "Quoted must be specified");
return true; return true;
} // endif Quote } // endif Quote
} else } else {
strlwr(strcpy(name, Name)); // Not a keyword safe_strcpy(name, sizeof(name), Name); // Not a keyword
strlwr(name);
}
if ((p = strstr(qrystr, name))) { if ((p = strstr(qrystr, name))) {
for (i = 0; i < p - qrystr; i++) for (i = 0; i < p - qrystr; i++)
...@@ -618,21 +623,29 @@ bool TDBEXT::MakeCommand(PGLOBAL g) ...@@ -618,21 +623,29 @@ bool TDBEXT::MakeCommand(PGLOBAL g)
schmp = Schema; schmp = Schema;
if (qtd && *(p - 1) == ' ') { if (qtd && *(p - 1) == ' ') {
if (schmp) if (schmp) {
strcat(strcat(stmt, schmp), "."); safe_strcat(stmt, stmt_sz, schmp);
safe_strcat(stmt, stmt_sz, ".");
}
strcat(strcat(strcat(stmt, Quote), TableName), Quote); safe_strcat(stmt, stmt_sz, Quote);
safe_strcat(stmt, stmt_sz, TableName);
safe_strcat(stmt, stmt_sz, Quote);
} else { } else {
if (schmp) { if (schmp) {
if (qtd && *(p - 1) != ' ') { if (qtd && *(p - 1) != ' ') {
stmt[i - 1] = 0; stmt[i - 1] = 0;
strcat(strcat(strcat(stmt, schmp), "."), Quote); safe_strcat(stmt, stmt_sz, schmp);
} else safe_strcat(stmt, stmt_sz, ".");
strcat(strcat(stmt, schmp), "."); safe_strcat(stmt, stmt_sz, Quote);
} else {
safe_strcat(stmt, stmt_sz, schmp);
safe_strcat(stmt, stmt_sz, ".");
}
} // endif schmp } // endif schmp
strcat(stmt, TableName); safe_strcat(stmt, stmt_sz, TableName);
} // endif's } // endif's
i = (int)strlen(stmt); i = (int)strlen(stmt);
...@@ -644,7 +657,7 @@ bool TDBEXT::MakeCommand(PGLOBAL g) ...@@ -644,7 +657,7 @@ bool TDBEXT::MakeCommand(PGLOBAL g)
RemoveConst(g, stmt); RemoveConst(g, stmt);
if (body) if (body)
strcat(stmt, body); safe_strcat(stmt, stmt_sz, body);
} else { } else {
snprintf(g->Message, sizeof(g->Message), "Cannot use this %s command", snprintf(g->Message, sizeof(g->Message), "Cannot use this %s command",
......
storage/connect/tabfmt.cpp
View file @ fc6e8a3d
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
#define NO_FUNC #define NO_FUNC
#include "plgcnx.h" // For DB types #include "plgcnx.h" // For DB types
#include "resource.h" #include "resource.h"
#include "m_string.h"
/***********************************************************************/ /***********************************************************************/
/* This should be an option. */ /* This should be an option. */
...@@ -137,7 +138,7 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info) ...@@ -137,7 +138,7 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info)
? strchr(tdp->Entry, '*') || strchr(tdp->Entry, '?') ? strchr(tdp->Entry, '*') || strchr(tdp->Entry, '?')
: GetBooleanTableOption(g, topt, "Mulentries", false); : GetBooleanTableOption(g, topt, "Mulentries", false);
#else // !ZIP_SUPPORT #else // !ZIP_SUPPORT
strcpy(g->Message, "ZIP not supported by this version"); safe_strcpy(g->Message, sizeof(g->Message), "ZIP not supported by this version");
return NULL; return NULL;
#endif // !ZIP_SUPPORT #endif // !ZIP_SUPPORT
} // endif // Zipped } // endif // Zipped
...@@ -145,7 +146,7 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info) ...@@ -145,7 +146,7 @@ PQRYRES CSVColumns(PGLOBAL g, PCSZ dp, PTOS topt, bool info)
fn = tdp->Fn = GetStringTableOption(g, topt, "Filename", NULL); fn = tdp->Fn = GetStringTableOption(g, topt, "Filename", NULL);
if (!tdp->Fn) { if (!tdp->Fn) {
strcpy(g->Message, MSG(MISSING_FNAME)); safe_strcpy(g->Message, sizeof(g->Message), MSG(MISSING_FNAME));
return NULL; return NULL;
} // endif Fn } // endif Fn
...@@ -472,7 +473,7 @@ bool CSVDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) ...@@ -472,7 +473,7 @@ bool CSVDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
if (Catfunc == FNC_NO) if (Catfunc == FNC_NO)
for (PCOLDEF cdp = To_Cols; cdp; cdp = cdp->GetNext()) for (PCOLDEF cdp = To_Cols; cdp; cdp = cdp->GetNext())
if (cdp->GetOffset() < 1 && !cdp->IsSpecial()) { if (cdp->GetOffset() < 1 && !cdp->IsSpecial()) {
strcpy(g->Message, MSG(BAD_OFFSET_VAL)); safe_strcpy(g->Message, sizeof(g->Message), MSG(BAD_OFFSET_VAL));
return true; return true;
} // endif Offset } // endif Offset
...@@ -528,11 +529,11 @@ PTDB CSVDEF::GetTable(PGLOBAL g, MODE mode) ...@@ -528,11 +529,11 @@ PTDB CSVDEF::GetTable(PGLOBAL g, MODE mode)
} else if (mode == MODE_INSERT) { } else if (mode == MODE_INSERT) {
txfp = new(g) ZIPFAM(this); txfp = new(g) ZIPFAM(this);
} else { } else {
strcpy(g->Message, "UPDATE/DELETE not supported for ZIP"); safe_strcpy(g->Message, sizeof(g->Message), "UPDATE/DELETE not supported for ZIP");
return NULL; return NULL;
} // endif's mode } // endif's mode
#else // !ZIP_SUPPORT #else // !ZIP_SUPPORT
strcpy(g->Message, "ZIP not supported"); safe_strcpy(g->Message, sizeof(g->Message), "ZIP not supported");
return NULL; return NULL;
#endif // !ZIP_SUPPORT #endif // !ZIP_SUPPORT
} else if (map) { } else if (map) {
...@@ -546,7 +547,7 @@ PTDB CSVDEF::GetTable(PGLOBAL g, MODE mode) ...@@ -546,7 +547,7 @@ PTDB CSVDEF::GetTable(PGLOBAL g, MODE mode)
txfp = new(g) ZLBFAM(this); txfp = new(g) ZLBFAM(this);
#else // !GZ_SUPPORT #else // !GZ_SUPPORT
strcpy(g->Message, "Compress not supported"); safe_strcpy(g->Message, sizeof(g->Message), "Compress not supported");
return NULL; return NULL;
#endif // !GZ_SUPPORT #endif // !GZ_SUPPORT
} else } else
...@@ -879,7 +880,7 @@ bool TDBCSV::SkipHeader(PGLOBAL g) ...@@ -879,7 +880,7 @@ bool TDBCSV::SkipHeader(PGLOBAL g)
if (q) if (q)
To_Line[strlen(To_Line)] = Qot; To_Line[strlen(To_Line)] = Qot;
strcat(To_Line, cdp->GetName()); safe_strcat(To_Line, Lrecl, cdp->GetName());
if (q) if (q)
To_Line[strlen(To_Line)] = Qot; To_Line[strlen(To_Line)] = Qot;
...@@ -1049,14 +1050,16 @@ bool TDBCSV::PrepareWriting(PGLOBAL g) ...@@ -1049,14 +1050,16 @@ bool TDBCSV::PrepareWriting(PGLOBAL g)
for (i = 0; i < Fields; i++) { for (i = 0; i < Fields; i++) {
if (i) if (i)
strcat(To_Line, sep); safe_strcat(To_Line, Lrecl, sep);
if (Field[i]) { if (Field[i]) {
if (!strlen(Field[i])) { if (!strlen(Field[i])) {
// Generally null fields are not quoted // Generally null fields are not quoted
if (Quoted > 2) if (Quoted > 2) {
// Except if explicitly required // Except if explicitly required
strcat(strcat(To_Line, qot), qot); safe_strcat(To_Line, Lrecl, qot);
safe_strcat(To_Line, Lrecl, qot);
}
} else if (Qot && (strchr(Field[i], Sep) || *Field[i] == Qot } else if (Qot && (strchr(Field[i], Sep) || *Field[i] == Qot
|| Quoted > 1 || (Quoted == 1 && !Fldtyp[i]))) { || Quoted > 1 || (Quoted == 1 && !Fldtyp[i]))) {
...@@ -1075,12 +1078,15 @@ bool TDBCSV::PrepareWriting(PGLOBAL g) ...@@ -1075,12 +1078,15 @@ bool TDBCSV::PrepareWriting(PGLOBAL g)
To_Line[k++] = Qot; To_Line[k++] = Qot;
To_Line[k] = '\0'; To_Line[k] = '\0';
} else } else {
strcat(strcat(strcat(To_Line, qot), Field[i]), qot); safe_strcat(To_Line, Lrecl, qot);
safe_strcat(To_Line, Lrecl, Field[i]);
safe_strcat(To_Line, Lrecl, qot);
}
} }
else else
strcat(To_Line, Field[i]); safe_strcat(To_Line, Lrecl, Field[i]);
} }
} // endfor i } // endfor i
...@@ -1157,7 +1163,7 @@ int TDBCSV::CheckWrite(PGLOBAL g) ...@@ -1157,7 +1163,7 @@ int TDBCSV::CheckWrite(PGLOBAL g)
} // endif } // endif
} }
if ((nlen += n) > maxlen) { if ((nlen += n) > maxlen) {
strcpy(g->Message, MSG(LINE_TOO_LONG)); safe_strcpy(g->Message, sizeof(g->Message), MSG(LINE_TOO_LONG));
return -1; return -1;
} // endif nlen } // endif nlen
...@@ -1267,7 +1273,7 @@ bool TDBFMT::OpenDB(PGLOBAL g) ...@@ -1267,7 +1273,7 @@ bool TDBFMT::OpenDB(PGLOBAL g)
} // endif n } // endif n
FldFormat[i] = (PSZ)PlugSubAlloc(g, NULL, n + 5); FldFormat[i] = (PSZ)PlugSubAlloc(g, NULL, n + 5);
strcpy(FldFormat[i], pfm); safe_strcpy(FldFormat[i], n + 5, pfm);
if (!strcmp(pfm + n, "%m")) { if (!strcmp(pfm + n, "%m")) {
// This is a field that can be missing. Flag it so it can // This is a field that can be missing. Flag it so it can
...@@ -1277,7 +1283,7 @@ bool TDBFMT::OpenDB(PGLOBAL g) ...@@ -1277,7 +1283,7 @@ bool TDBFMT::OpenDB(PGLOBAL g)
} else if (i+1 < Fields && strcmp(pfm + n, "%n")) { } else if (i+1 < Fields && strcmp(pfm + n, "%n")) {
// There are trailing characters after the field contents // There are trailing characters after the field contents
// add a marker for the next field start position. // add a marker for the next field start position.
strcat(FldFormat[i], "%n"); safe_strcat(FldFormat[i], n + 5, "%n");
FmtTest[i] = 1; FmtTest[i] = 1;
} // endif's } // endif's
......
storage/connect/tabjdbc.cpp
View file @ fc6e8a3d
...@@ -277,7 +277,7 @@ PTDB JDBCDEF::GetTable(PGLOBAL g, MODE m) ...@@ -277,7 +277,7 @@ PTDB JDBCDEF::GetTable(PGLOBAL g, MODE m)
if (Multiple == 1) if (Multiple == 1)
tdbp = new(g)TDBMUL(tdbp); tdbp = new(g)TDBMUL(tdbp);
else if (Multiple == 2) else if (Multiple == 2)
strcpy(g->Message, "NO_JDBC_MUL"); safe_strcpy(g->Message, sizeof(g->Message), "NO_JDBC_MUL");
} // endswitch Catfunc } // endswitch Catfunc
...@@ -386,7 +386,7 @@ bool TDBJDBC::MakeInsert(PGLOBAL g) ...@@ -386,7 +386,7 @@ bool TDBJDBC::MakeInsert(PGLOBAL g)
for (colp = Columns; colp; colp = colp->GetNext()) for (colp = Columns; colp; colp = colp->GetNext())
if (colp->IsSpecial()) { if (colp->IsSpecial()) {
strcpy(g->Message, "No JDBC special columns"); safe_strcpy(g->Message, sizeof(g->Message), "No JDBC special columns");
return true; return true;
} else { } else {
// Column name can be encoded in UTF-8 // Column name can be encoded in UTF-8
...@@ -460,7 +460,7 @@ bool TDBJDBC::MakeInsert(PGLOBAL g) ...@@ -460,7 +460,7 @@ bool TDBJDBC::MakeInsert(PGLOBAL g)
} // endfor colp } // endfor colp
if ((Query->Append(") VALUES ("))) { if ((Query->Append(") VALUES ("))) {
strcpy(g->Message, "MakeInsert: Out of memory"); safe_strcpy(g->Message, sizeof(g->Message), "MakeInsert: Out of memory");
return true; return true;
} else // in case prepared statement fails } else // in case prepared statement fails
pos = Query->GetLength(); pos = Query->GetLength();
...@@ -470,7 +470,7 @@ bool TDBJDBC::MakeInsert(PGLOBAL g) ...@@ -470,7 +470,7 @@ bool TDBJDBC::MakeInsert(PGLOBAL g)
Query->Append("?,"); Query->Append("?,");
if (Query->IsTruncated()) { if (Query->IsTruncated()) {
strcpy(g->Message, "MakeInsert: Out of memory"); safe_strcpy(g->Message, sizeof(g->Message), "MakeInsert: Out of memory");
return true; return true;
} else } else
Query->RepLast(')'); Query->RepLast(')');
...@@ -532,12 +532,15 @@ int TDBJDBC::Cardinality(PGLOBAL g) ...@@ -532,12 +532,15 @@ int TDBJDBC::Cardinality(PGLOBAL g)
// Table name can be encoded in UTF-8 // Table name can be encoded in UTF-8
Decode(TableName, tbn, sizeof(tbn)); Decode(TableName, tbn, sizeof(tbn));
strcpy(qry, "SELECT COUNT(*) FROM "); safe_strcpy(qry, sizeof(qry), "SELECT COUNT(*) FROM ");
if (Quote) if (Quote) {
strcat(strcat(strcat(qry, Quote), tbn), Quote); safe_strcat(qry, sizeof(qry), Quote);
safe_strcat(qry, sizeof(qry), tbn);
safe_strcat(qry, sizeof(qry), Quote);
}
else else
strcat(qry, tbn); safe_strcat(qry, sizeof(qry), tbn);
// Allocate a Count(*) column (must not use the default constructor) // Allocate a Count(*) column (must not use the default constructor)
Cnp = new(g)JDBCCOL; Cnp = new(g)JDBCCOL;
...@@ -654,7 +657,7 @@ bool TDBJDBC::OpenDB(PGLOBAL g) ...@@ -654,7 +657,7 @@ bool TDBJDBC::OpenDB(PGLOBAL g)
if ((Qrp = Jcp->AllocateResult(g, this))) if ((Qrp = Jcp->AllocateResult(g, this)))
Memory = 2; // Must be filled Memory = 2; // Must be filled
else { else {
strcpy(g->Message, "Result set memory allocation failed"); safe_strcpy(g->Message, sizeof(g->Message), "Result set memory allocation failed");
return true; return true;
} // endif n } // endif n
...@@ -681,7 +684,7 @@ bool TDBJDBC::OpenDB(PGLOBAL g) ...@@ -681,7 +684,7 @@ bool TDBJDBC::OpenDB(PGLOBAL g)
#if 0 #if 0
if (!(rc = MakeInsert(g))) { if (!(rc = MakeInsert(g))) {
if (Nparm != Jcp->PrepareSQL(Query->GetStr())) { if (Nparm != Jcp->PrepareSQL(Query->GetStr())) {
strcpy(g->Message, MSG(PARM_CNT_MISS)); safe_strcpy(g->Message, sizeof(g->Message), MSG(PARM_CNT_MISS));
rc = true; rc = true;
} else } else
rc = BindParameters(g); rc = BindParameters(g);
...@@ -733,12 +736,12 @@ bool TDBJDBC::SetRecpos(PGLOBAL g, int recpos) ...@@ -733,12 +736,12 @@ bool TDBJDBC::SetRecpos(PGLOBAL g, int recpos)
CurNum = recpos; CurNum = recpos;
Fpos = recpos; Fpos = recpos;
} else { } else {
strcpy(g->Message, "Scrolling out of row set NIY"); safe_strcpy(g->Message, sizeof(g->Message), "Scrolling out of row set NIY");
return true; return true;
} // endif recpos } // endif recpos
} else { } else {
strcpy(g->Message, "This action requires a scrollable cursor"); safe_strcpy(g->Message, sizeof(g->Message), "This action requires a scrollable cursor");
return true; return true;
} // endif's } // endif's
...@@ -784,7 +787,7 @@ bool TDBJDBC::ReadKey(PGLOBAL g, OPVAL op, const key_range *kr) ...@@ -784,7 +787,7 @@ bool TDBJDBC::ReadKey(PGLOBAL g, OPVAL op, const key_range *kr)
if (To_CondFil) if (To_CondFil)
if (Query->Append(" AND ") || Query->Append(To_CondFil->Body)) { if (Query->Append(" AND ") || Query->Append(To_CondFil->Body)) {
strcpy(g->Message, "Readkey: Out of memory"); safe_strcpy(g->Message, sizeof(g->Message), "Readkey: Out of memory");
return true; return true;
} // endif Append } // endif Append
...@@ -917,7 +920,7 @@ int TDBJDBC::WriteDB(PGLOBAL g) ...@@ -917,7 +920,7 @@ int TDBJDBC::WriteDB(PGLOBAL g)
} // endfor colp } // endfor colp
if (unlikely(Query->IsTruncated())) { if (unlikely(Query->IsTruncated())) {
strcpy(g->Message, "WriteDB: Out of memory"); safe_strcpy(g->Message, sizeof(g->Message), "WriteDB: Out of memory");
return RC_FX; return RC_FX;
} // endif Query } // endif Query
...@@ -1110,13 +1113,13 @@ PCMD TDBXJDC::MakeCMD(PGLOBAL g) ...@@ -1110,13 +1113,13 @@ PCMD TDBXJDC::MakeCMD(PGLOBAL g)
(To_CondFil->Op == OP_EQ || To_CondFil->Op == OP_IN)) { (To_CondFil->Op == OP_EQ || To_CondFil->Op == OP_IN)) {
xcmd = To_CondFil->Cmds; xcmd = To_CondFil->Cmds;
} else } else
strcpy(g->Message, "Invalid command specification filter"); safe_strcpy(g->Message, sizeof(g->Message), "Invalid command specification filter");
} else } else
strcpy(g->Message, "No command column in select list"); safe_strcpy(g->Message, sizeof(g->Message), "No command column in select list");
} else if (!Srcdef) } else if (!Srcdef)
strcpy(g->Message, "No Srcdef default command"); safe_strcpy(g->Message, sizeof(g->Message), "No Srcdef default command");
else else
xcmd = new(g) CMD(g, Srcdef); xcmd = new(g) CMD(g, Srcdef);
...@@ -1149,7 +1152,7 @@ bool TDBXJDC::OpenDB(PGLOBAL g) ...@@ -1149,7 +1152,7 @@ bool TDBXJDC::OpenDB(PGLOBAL g)
this, Tdb_No, Use, Mode); this, Tdb_No, Use, Mode);
if (Use == USE_OPEN) { if (Use == USE_OPEN) {
strcpy(g->Message, "Multiple execution is not allowed"); safe_strcpy(g->Message, sizeof(g->Message), "Multiple execution is not allowed");
return true; return true;
} // endif use } // endif use
...@@ -1171,7 +1174,7 @@ bool TDBXJDC::OpenDB(PGLOBAL g) ...@@ -1171,7 +1174,7 @@ bool TDBXJDC::OpenDB(PGLOBAL g)
Use = USE_OPEN; // Do it now in case we are recursively called Use = USE_OPEN; // Do it now in case we are recursively called
if (Mode != MODE_READ && Mode != MODE_READX) { if (Mode != MODE_READ && Mode != MODE_READX) {
strcpy(g->Message, "No INSERT/DELETE/UPDATE of XJDBC tables"); safe_strcpy(g->Message, sizeof(g->Message), "No INSERT/DELETE/UPDATE of XJDBC tables");
return true; return true;
} // endif Mode } // endif Mode
...@@ -1224,7 +1227,7 @@ int TDBXJDC::ReadDB(PGLOBAL g) ...@@ -1224,7 +1227,7 @@ int TDBXJDC::ReadDB(PGLOBAL g)
/***********************************************************************/ /***********************************************************************/
int TDBXJDC::WriteDB(PGLOBAL g) int TDBXJDC::WriteDB(PGLOBAL g)
{ {
strcpy(g->Message, "Execsrc tables are read only"); safe_strcpy(g->Message, sizeof(g->Message), "Execsrc tables are read only");
return RC_FX; return RC_FX;
} // end of DeleteDB } // end of DeleteDB
...@@ -1233,7 +1236,7 @@ int TDBXJDC::WriteDB(PGLOBAL g) ...@@ -1233,7 +1236,7 @@ int TDBXJDC::WriteDB(PGLOBAL g)
/***********************************************************************/ /***********************************************************************/
int TDBXJDC::DeleteDB(PGLOBAL g, int irc) int TDBXJDC::DeleteDB(PGLOBAL g, int irc)
{ {
strcpy(g->Message, "NO_XJDBC_DELETE"); safe_strcpy(g->Message, sizeof(g->Message), "NO_XJDBC_DELETE");
return RC_FX; return RC_FX;
} // end of DeleteDB } // end of DeleteDB
......
storage/connect/tabjson.cpp
View file @ fc6e8a3d
...@@ -85,7 +85,7 @@ PQRYRES JSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info) ...@@ -85,7 +85,7 @@ PQRYRES JSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info)
} // endif info } // endif info
if (GetIntegerTableOption(g, topt, "Multiple", 0)) { if (GetIntegerTableOption(g, topt, "Multiple", 0)) {
strcpy(g->Message, "Cannot find column definition for multiple table"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot find column definition for multiple table");
return NULL; return NULL;
} // endif Multiple } // endif Multiple
...@@ -212,7 +212,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt) ...@@ -212,7 +212,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
tdp->Uri = (dsn && *dsn ? dsn : NULL); tdp->Uri = (dsn && *dsn ? dsn : NULL);
if (!tdp->Fn && !tdp->Uri) { if (!tdp->Fn && !tdp->Uri) {
strcpy(g->Message, MSG(MISSING_FNAME)); safe_strcpy(g->Message, sizeof(g->Message), MSG(MISSING_FNAME));
return 0; return 0;
} else } else
topt->subtype = NULL; topt->subtype = NULL;
...@@ -320,7 +320,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt) ...@@ -320,7 +320,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
switch (tjnp->ReadDB(g)) { switch (tjnp->ReadDB(g)) {
case RC_EF: case RC_EF:
strcpy(g->Message, "Void json table"); safe_strcpy(g->Message, sizeof(g->Message), "Void json table");
case RC_FX: case RC_FX:
goto err; goto err;
default: default:
...@@ -333,7 +333,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt) ...@@ -333,7 +333,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
} // endif pretty } // endif pretty
if (!(row = (jsp) ? jsp->GetObject() : NULL)) { if (!(row = (jsp) ? jsp->GetObject() : NULL)) {
strcpy(g->Message, "Can only retrieve columns from object rows"); safe_strcpy(g->Message, sizeof(g->Message), "Can only retrieve columns from object rows");
goto err; goto err;
} // endif row } // endif row
...@@ -417,7 +417,7 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j) ...@@ -417,7 +417,7 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j)
if (jvp && jvp->DataType != TYPE_JSON) { if (jvp && jvp->DataType != TYPE_JSON) {
if (JsonAllPath() && !fmt[bf]) if (JsonAllPath() && !fmt[bf])
strcat(fmt, colname); safe_strcat(fmt, sizeof(fmt), colname);
jcol.Type = jvp->DataType; jcol.Type = jvp->DataType;
...@@ -450,7 +450,7 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j) ...@@ -450,7 +450,7 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j)
jcol.Cbn = true; jcol.Cbn = true;
} else if (j < lvl && !Stringified(strfy, colname)) { } else if (j < lvl && !Stringified(strfy, colname)) {
if (!fmt[bf]) if (!fmt[bf])
strcat(fmt, colname); safe_strcat(fmt, sizeof(fmt), colname);
p = fmt + strlen(fmt); p = fmt + strlen(fmt);
jsp = jvp->GetJson(); jsp = jvp->GetJson();
...@@ -520,11 +520,11 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j) ...@@ -520,11 +520,11 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j)
} else if (lvl >= 0) { } else if (lvl >= 0) {
if (Stringified(strfy, colname)) { if (Stringified(strfy, colname)) {
if (!fmt[bf]) if (!fmt[bf])
strcat(fmt, colname); safe_strcat(fmt, sizeof(fmt), colname);
strcat(fmt, ".*"); safe_strcat(fmt, sizeof(fmt), ".*");
} else if (JsonAllPath() && !fmt[bf]) } else if (JsonAllPath() && !fmt[bf])
strcat(fmt, colname); safe_strcat(fmt, sizeof(fmt), colname);
jcol.Type = TYPE_STRG; jcol.Type = TYPE_STRG;
jcol.Len = sz; jcol.Len = sz;
...@@ -735,7 +735,7 @@ PTDB JSONDEF::GetTable(PGLOBAL g, MODE m) ...@@ -735,7 +735,7 @@ PTDB JSONDEF::GetTable(PGLOBAL g, MODE m)
} else if (m == MODE_INSERT) { } else if (m == MODE_INSERT) {
txfp = new(g) ZIPFAM(this); txfp = new(g) ZIPFAM(this);
} else { } else {
strcpy(g->Message, "UPDATE/DELETE not supported for ZIP"); safe_strcpy(g->Message, sizeof(g->Message), "UPDATE/DELETE not supported for ZIP");
return NULL; return NULL;
} // endif's m } // endif's m
#else // !ZIP_SUPPORT #else // !ZIP_SUPPORT
...@@ -775,7 +775,7 @@ PTDB JSONDEF::GetTable(PGLOBAL g, MODE m) ...@@ -775,7 +775,7 @@ PTDB JSONDEF::GetTable(PGLOBAL g, MODE m)
#endif // 0 #endif // 0
((TDBJSN*)tdbp)->G = PlugInit(NULL, (size_t)Lrecl * (Pretty >= 0 ? 12 : 4)); ((TDBJSN*)tdbp)->G = PlugInit(NULL, (size_t)Lrecl * (Pretty >= 0 ? 12 : 4));
} else { } else {
strcpy(g->Message, "LRECL is not defined"); safe_strcpy(g->Message, sizeof(g->Message), "LRECL is not defined");
return NULL; return NULL;
} // endif Lrecl } // endif Lrecl
...@@ -785,10 +785,10 @@ PTDB JSONDEF::GetTable(PGLOBAL g, MODE m) ...@@ -785,10 +785,10 @@ PTDB JSONDEF::GetTable(PGLOBAL g, MODE m)
if (m == MODE_READ || m == MODE_ANY || m == MODE_ALTER) { if (m == MODE_READ || m == MODE_ANY || m == MODE_ALTER) {
txfp = new(g) UNZFAM(this); txfp = new(g) UNZFAM(this);
} else if (m == MODE_INSERT) { } else if (m == MODE_INSERT) {
strcpy(g->Message, "INSERT supported only for zipped JSON when pretty=0"); safe_strcpy(g->Message, sizeof(g->Message), "INSERT supported only for zipped JSON when pretty=0");
return NULL; return NULL;
} else { } else {
strcpy(g->Message, "UPDATE/DELETE not supported for ZIP"); safe_strcpy(g->Message, sizeof(g->Message), "UPDATE/DELETE not supported for ZIP");
return NULL; return NULL;
} // endif's m } // endif's m
#else // !ZIP_SUPPORT #else // !ZIP_SUPPORT
...@@ -1145,7 +1145,7 @@ int TDBJSN::ReadDB(PGLOBAL g) { ...@@ -1145,7 +1145,7 @@ int TDBJSN::ReadDB(PGLOBAL g) {
M = 1; M = 1;
rc = RC_OK; rc = RC_OK;
} else if (Pretty != 1 || strcmp(To_Line, "]")) { } else if (Pretty != 1 || strcmp(To_Line, "]")) {
strcpy(g->Message, G->Message); safe_strcpy(g->Message, sizeof(g->Message), G->Message);
rc = RC_FX; rc = RC_FX;
} else } else
rc = RC_EF; rc = RC_EF;
...@@ -1258,7 +1258,7 @@ bool TDBJSN::PrepareWriting(PGLOBAL g) ...@@ -1258,7 +1258,7 @@ bool TDBJSN::PrepareWriting(PGLOBAL g)
strcat(s, ","); strcat(s, ",");
if ((signed)strlen(s) > Lrecl) { if ((signed)strlen(s) > Lrecl) {
strncpy(To_Line, s, Lrecl); safe_strcpy(To_Line, Lrecl, s);
snprintf(g->Message, sizeof(g->Message), "Line truncated (lrecl=%d)", Lrecl); snprintf(g->Message, sizeof(g->Message), "Line truncated (lrecl=%d)", Lrecl);
return PushWarning(g, this); return PushWarning(g, this);
} else } else
...@@ -1360,7 +1360,7 @@ bool JSONCOL::CheckExpand(PGLOBAL g, int i, PSZ nm, bool b) ...@@ -1360,7 +1360,7 @@ bool JSONCOL::CheckExpand(PGLOBAL g, int i, PSZ nm, bool b)
Xpd = true; // Expandable object Xpd = true; // Expandable object
Nodes[i].Op = OP_EXP; Nodes[i].Op = OP_EXP;
} else if (b) { } else if (b) {
strcpy(g->Message, "Cannot expand more than one branch"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot expand more than one branch");
return true; return true;
} // endif Xcol } // endif Xcol
...@@ -1571,7 +1571,7 @@ bool JSONCOL::ParseJpath(PGLOBAL g) ...@@ -1571,7 +1571,7 @@ bool JSONCOL::ParseJpath(PGLOBAL g)
if (SetArrayOptions(g, p, i, Nodes[i - 1].Key)) if (SetArrayOptions(g, p, i, Nodes[i - 1].Key))
return true; return true;
else if (Xpd && Tjp->Mode == MODE_DELETE) { else if (Xpd && Tjp->Mode == MODE_DELETE) {
strcpy(g->Message, "Cannot delete expanded columns"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot delete expanded columns");
return true; return true;
} // endif Xpd } // endif Xpd
...@@ -1675,7 +1675,7 @@ PSZ JSONCOL::GetJpath(PGLOBAL g, bool proj) ...@@ -1675,7 +1675,7 @@ PSZ JSONCOL::GetJpath(PGLOBAL g, bool proj)
PVAL JSONCOL::MakeJson(PGLOBAL g, PJSON jsp, int n) PVAL JSONCOL::MakeJson(PGLOBAL g, PJSON jsp, int n)
{ {
if (Value->IsTypeNum()) { if (Value->IsTypeNum()) {
strcpy(g->Message, "Cannot make Json for a numeric column"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot make Json for a numeric column");
if (!Warned) { if (!Warned) {
PushWarning(g, Tjp); PushWarning(g, Tjp);
...@@ -1690,10 +1690,10 @@ PVAL JSONCOL::MakeJson(PGLOBAL g, PJSON jsp, int n) ...@@ -1690,10 +1690,10 @@ PVAL JSONCOL::MakeJson(PGLOBAL g, PJSON jsp, int n)
ulong len = Tjp->Lrecl ? Tjp->Lrecl : 500; ulong len = Tjp->Lrecl ? Tjp->Lrecl : 500;
PBSON bsp = JbinAlloc(g, NULL, len, jsp); PBSON bsp = JbinAlloc(g, NULL, len, jsp);
strcat(bsp->Msg, " column"); safe_strcat(bsp->Msg, sizeof(bsp->Msg), " column");
((BINVAL*)Value)->SetBinValue(bsp, sizeof(BSON)); ((BINVAL*)Value)->SetBinValue(bsp, sizeof(BSON));
} else { } else {
strcpy(g->Message, "Column size too small"); safe_strcpy(g->Message, sizeof(g->Message), "Column size too small");
Value->SetValue_char(NULL, 0); Value->SetValue_char(NULL, 0);
} // endif Clen } // endif Clen
#endif // 0 #endif // 0
...@@ -1937,7 +1937,7 @@ PVAL JSONCOL::ExpandArray(PGLOBAL g, PJAR arp, int n) ...@@ -1937,7 +1937,7 @@ PVAL JSONCOL::ExpandArray(PGLOBAL g, PJAR arp, int n)
} // endif ars } // endif ars
if (!(jvp = arp->GetArrayValue((Nodes[n].Rx = Nodes[n].Nx)))) { if (!(jvp = arp->GetArrayValue((Nodes[n].Rx = Nodes[n].Nx)))) {
strcpy(g->Message, "Logical error expanding array"); safe_strcpy(g->Message, sizeof(g->Message), "Logical error expanding array");
throw 666; throw 666;
} // endif jvp } // endif jvp
...@@ -2125,7 +2125,7 @@ PJSON JSONCOL::GetRow(PGLOBAL g) ...@@ -2125,7 +2125,7 @@ PJSON JSONCOL::GetRow(PGLOBAL g)
((PJAR)row)->AddArrayValue(G, new(G) JVALUE(nwr)); ((PJAR)row)->AddArrayValue(G, new(G) JVALUE(nwr));
((PJAR)row)->InitArray(G); ((PJAR)row)->InitArray(G);
} else { } else {
strcpy(g->Message, "Wrong type when writing new row"); safe_strcpy(g->Message, sizeof(g->Message), "Wrong type when writing new row");
nwr = NULL; nwr = NULL;
} // endif's } // endif's
...@@ -2146,7 +2146,7 @@ PJSON JSONCOL::GetRow(PGLOBAL g) ...@@ -2146,7 +2146,7 @@ PJSON JSONCOL::GetRow(PGLOBAL g)
void JSONCOL::WriteColumn(PGLOBAL g) void JSONCOL::WriteColumn(PGLOBAL g)
{ {
if (Xpd && Tjp->Pretty < 2) { if (Xpd && Tjp->Pretty < 2) {
strcpy(g->Message, "Cannot write expanded column when Pretty is not 2"); safe_strcpy(g->Message, sizeof(g->Message), "Cannot write expanded column when Pretty is not 2");
throw 666; throw 666;
} // endif Xpd } // endif Xpd
...@@ -2182,7 +2182,7 @@ void JSONCOL::WriteColumn(PGLOBAL g) ...@@ -2182,7 +2182,7 @@ void JSONCOL::WriteColumn(PGLOBAL g)
if (s && *s) { if (s && *s) {
if (!(jsp = ParseJson(G, s, strlen(s)))) { if (!(jsp = ParseJson(G, s, strlen(s)))) {
strcpy(g->Message, s); safe_strcpy(g->Message, sizeof(g->Message), s);
throw 666; throw 666;
} // endif jsp } // endif jsp
...@@ -2365,7 +2365,7 @@ int TDBJSON::MakeDocument(PGLOBAL g) ...@@ -2365,7 +2365,7 @@ int TDBJSON::MakeDocument(PGLOBAL g)
if (!a && *p && *p != '[' && !IsNum(p)) { if (!a && *p && *p != '[' && !IsNum(p)) {
// obj is a key // obj is a key
if (jsp->GetType() != TYPE_JOB) { if (jsp->GetType() != TYPE_JOB) {
strcpy(g->Message, "Table path does not match the json file"); safe_strcpy(g->Message, sizeof(g->Message), "Table path does not match the json file");
return RC_FX; return RC_FX;
} // endif Type } // endif Type
...@@ -2391,7 +2391,7 @@ int TDBJSON::MakeDocument(PGLOBAL g) ...@@ -2391,7 +2391,7 @@ int TDBJSON::MakeDocument(PGLOBAL g)
} // endif p } // endif p
if (jsp->GetType() != TYPE_JAR) { if (jsp->GetType() != TYPE_JAR) {
strcpy(g->Message, "Table path does not match the json file"); safe_strcpy(g->Message, sizeof(g->Message), "Table path does not match the json file");
return RC_FX; return RC_FX;
} // endif Type } // endif Type
...@@ -2486,7 +2486,7 @@ void TDBJSON::ResetSize(void) ...@@ -2486,7 +2486,7 @@ void TDBJSON::ResetSize(void)
int TDBJSON::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool) int TDBJSON::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool)
{ {
if (pxdf) { if (pxdf) {
strcpy(g->Message, "JSON not indexable when pretty = 2"); safe_strcpy(g->Message, sizeof(g->Message), "JSON not indexable when pretty = 2");
return RC_FX; return RC_FX;
} else } else
return RC_OK; return RC_OK;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7