Skip to content
/ server Public

Static analysis fixes #4868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FaramosCZ wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Static analysis fixes #4868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a226655
MyISAM: validate deleted block_len upper bound
FaramosCZ Mar 26, 2026
4c74289
Fix unsigned underflow in sp_make_key functions
FaramosCZ Mar 26, 2026
5c5aa73
Validate .cfg string lengths in InnoDB import
FaramosCZ Mar 26, 2026
6a12dd9
Fix end-iterator dereference in log recovery
FaramosCZ Mar 26, 2026
24d1909
Fix buffer overflow in CONNECT tabmysql.cpp
FaramosCZ Mar 26, 2026
a8da266
Fix buffer overflow in CONNECT bsonudf/jsonudf
FaramosCZ Mar 26, 2026
9edc661
Fix std::bad_alloc in noexcept destructors
FaramosCZ Mar 26, 2026
a9da280
Fix std::bad_alloc in InnoDB dict noexcept functions
FaramosCZ Mar 26, 2026
b4a0cc2
Fix std::bad_alloc in trx purge noexcept functions
FaramosCZ Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion sql/sql_class.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "mariadb.h"
#include "sql_priv.h"
#include "sql_class.h"
#include <new>
#include "sql_cache.h" // query_cache_abort
#include "sql_base.h" // close_thread_tables
#include "sql_time.h" // date_time_format_copy
Expand Down Expand Up @@ -1893,7 +1894,17 @@ THD::~THD()
delete wsrep_rgi;
#endif
if (!free_connection_done)
free_connection();
{
try
{
free_connection();
}
catch (const std::bad_alloc&)
{
sql_print_warning("~THD(): free_connection():"
" memory allocation failure");
}
}

#ifdef WITH_WSREP
mysql_cond_destroy(&COND_wsrep_thd);
Expand Down
12 changes: 11 additions & 1 deletion sql/sql_insert.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
#include "mariadb.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_list.h"
#include "sql_priv.h"
#include <new>
#include "sql_insert.h"
#include "sql_update.h" // compare_record
#include "sql_base.h" // close_thread_tables
Expand Down Expand Up @@ -2711,7 +2712,16 @@ class Delayed_insert :public ilink {
delete row;
if (table)
{
close_thread_tables(&thd);
try
{
close_thread_tables(&thd);
}
catch (const std::bad_alloc&)
{
sql_print_warning("~Delayed_insert():"
" close_thread_tables():"
" memory allocation failure");
}
thd.mdl_context.release_transactional_locks(&thd);
}
mysql_mutex_destroy(&mutex);
Expand Down
13 changes: 11 additions & 2 deletions sql/table.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
#endif
#include "log_event.h" // MAX_TABLE_MAP_ID
#include "sql_class.h"
#include <new>
#include "opt_hints.h"

/* For MySQL 5.7 virtual fields */
Expand Down Expand Up @@ -10649,8 +10650,16 @@ TR_table::~TR_table()
{
if (table)
{
thd->temporary_tables= NULL;
close_log_table(thd, open_tables_backup);
try
{
thd->temporary_tables= NULL;
close_log_table(thd, open_tables_backup);
}
catch (const std::bad_alloc&)
{
sql_print_warning("~TR_table():"
" memory allocation failure");
}
}
delete open_tables_backup;
}
Expand Down
37 changes: 19 additions & 18 deletions storage/connect/bsonudf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <mysqld.h>
#include <mysqld_error.h>
#include <mysql.h>
#include <m_string.h>
#include <sql_error.h>
#include <stdio.h>
#include <cassert>
Expand Down Expand Up @@ -1987,10 +1988,10 @@ char* bsonvalue(UDF_INIT* initid, UDF_ARGS* args, char* result,
PBVAL bvp = bnx.MakeValue(args, 0, true);

if (!(str = bnx.Serialize(g, bvp, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

} else
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2035,10 +2036,10 @@ char* bson_make_array(UDF_INIT* initid, UDF_ARGS* args, char* result,
} // endfor i

if (!(str = bnx.Serialize(g, arp, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

} else
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2356,7 +2357,7 @@ char *bson_make_object(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif CheckMemory

if (!str)
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2406,7 +2407,7 @@ char *bson_object_nonull(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif CheckMemory

if (!str)
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2459,7 +2460,7 @@ char *bson_object_key(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif CheckMemory

if (!str)
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2946,7 +2947,7 @@ char *bson_array_grp(UDF_INIT *initid, UDF_ARGS *, char *result,
PUSH_WARNING("Result truncated to json_grp_size values");

if (!arp || !(str = bxp->Serialize(g, arp, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

*res_length = strlen(str);
return str;
Expand Down Expand Up @@ -3019,7 +3020,7 @@ char *bson_object_grp(UDF_INIT *initid, UDF_ARGS *, char *result,
PUSH_WARNING("Result truncated to json_grp_size values");

if (!bop || !(str = bxp->Serialize(g, bop, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

*res_length = strlen(str);
return str;
Expand Down Expand Up @@ -4760,9 +4761,9 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
FILE *fin;

if (!(fin = global_fopen(g, msgid, fn, "rt")))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
else if (!(fout = global_fopen(g, msgid, ofn, "wb")))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
else if ((buf = (char*)malloc(lrecl))) {
try {
do {
Expand All @@ -4773,7 +4774,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (!feof(fin)) {
snprintf(g->Message, sizeof(g->Message), "Error %d reading %zu bytes from %s",
errno, lrecl, fn);
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} else
str = strcpy(result, ofn);

Expand All @@ -4785,16 +4786,16 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (fwrite(&binszp, sizeof(binszp), 1, fout) != 1) {
snprintf(g->Message, sizeof(g->Message), "Error %d writing %zu bytes to %s",
errno, sizeof(binszp), ofn);
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} else if (fwrite(jsp, binszp, 1, fout) != 1) {
snprintf(g->Message, sizeof(g->Message), "Error %d writing %zu bytes to %s",
errno, binszp, ofn);
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} else
loop = true;

} else {
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} // endif jsp

} else
Expand All @@ -4803,7 +4804,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
} while (loop);

} catch (int) {
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} catch (const char* msg) {
str = strcpy(result, msg);
} // end catch
Expand All @@ -4820,7 +4821,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,

if (!str) {
if (g->Message[0] != '\0')
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
else
str = strcpy(result, "Unexpected error");

Expand Down Expand Up @@ -4864,7 +4865,7 @@ char *bson_serialize(UDF_INIT *initid, UDF_ARGS *args, char *result,

// if (!(str = bnx.Serialize(g, bvp, bsp->Filename, bsp->Pretty)))
if (!(str = bnx.Serialize(g, bvp, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down
38 changes: 19 additions & 19 deletions storage/connect/jsonudf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2082,10 +2082,10 @@ char *jsonvalue(UDF_INIT *initid, UDF_ARGS *args, char *result,
PJVAL jvp = MakeValue(g, args, 0);

if (!(str = Serialize(g, jvp, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

} else
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2128,10 +2128,10 @@ char *json_make_array(UDF_INIT *initid, UDF_ARGS *args, char *result,
arp->InitArray(g);

if (!(str = Serialize(g, arp, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

} else
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2679,7 +2679,7 @@ char *json_make_object(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif CheckMemory

if (!str)
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2729,7 +2729,7 @@ char *json_object_nonull(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif CheckMemory

if (!str)
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -2781,7 +2781,7 @@ char *json_object_key(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif CheckMemory

if (!str)
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -3232,7 +3232,7 @@ char *json_array_grp(UDF_INIT *initid, UDF_ARGS *, char *result,
str = NULL;

if (!str)
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

*res_length = strlen(str);
return str;
Expand Down Expand Up @@ -3303,7 +3303,7 @@ char *json_object_grp(UDF_INIT *initid, UDF_ARGS *, char *result,
PUSH_WARNING("Result truncated to json_grp_size values");

if (!objp || !(str = Serialize(g, objp, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

*res_length = strlen(str);
return str;
Expand Down Expand Up @@ -5901,7 +5901,7 @@ char *json_serialize(UDF_INIT *initid, UDF_ARGS *args, char *result,
JsonSubSet(g);

if (!(str = Serialize(g, bsp->Jsp, NULL, 0)))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

// Keep result of constant function
g->Xchk = (initid->const_item) ? str : NULL;
Expand Down Expand Up @@ -6028,9 +6028,9 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
FILE *fin;

if (!(fin = global_fopen(g, msgid, fn, "rt")))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
else if (!(fout = global_fopen(g, msgid, ofn, "wb")))
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
else if ((buf = (char*)PlgDBSubAlloc(g, NULL, lrecl)) &&
(binszp = (size_t*)PlgDBSubAlloc(g, NULL, sizeof(size_t)))) {
JsonMemSave(g);
Expand All @@ -6043,7 +6043,7 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (!fgets(buf, lrecl, fin)) {
if (!feof(fin)) {
snprintf(g->Message, sizeof(g->Message), "Error %d reading %zu bytes from %s", errno, lrecl, fn);
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} else
str = strcpy(result, ofn);

Expand All @@ -6058,16 +6058,16 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (fwrite(binszp, sizeof(binszp), 1, fout) != 1) {
snprintf(g->Message, sizeof(g->Message), "Error %d writing %zu bytes to %s",
errno, sizeof(binszp), ofn);
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} else if (fwrite(jsp, *binszp, 1, fout) != 1) {
snprintf(g->Message, sizeof(g->Message), "Error %d writing %zu bytes to %s",
errno, *binszp, ofn);
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} else
loop = true;

} else {
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} // endif jsp

} else
Expand All @@ -6076,13 +6076,13 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,
} while (loop);

} catch (int) {
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
} catch (const char* msg) {
str = strcpy(result, msg);
} // end catch

} else
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;

if (fin) fclose(fin);
if (fout) fclose(fout);
Expand All @@ -6092,7 +6092,7 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result,

if (!str) {
if (g->Message[0] != '\0')
str = strcpy(result, g->Message);
safe_strcpy(result, 255, g->Message), str = result;
else
str = strcpy(result, "Unexpected error");

Expand Down
Loading
Loading