summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-10 00:00:20 +0200
committerunknown <monty@mysql.com>2003-12-10 00:00:20 +0200
commit6b97c26a29127f73c699aaa13ffb5ae9f33703cf (patch)
tree3974a0549628cd8fca7b70530e3d0443783de374 /client/mysqltest.c
parent4e85bf326e8051533bb680d1a612813705dc789d (diff)
downloadmariadb-git-6b97c26a29127f73c699aaa13ffb5ae9f33703cf.tar.gz
Added checking of return value from my_once_alloc() in charset
Added checking of return value from malloc() in reg_init() client/mysqltest.c: Added comment dbug/dbug.c: Removed not needed test mysys/charset.c: Added checking of return value from my_once_alloc() regex/reginit.c: Abort if out of memory in reg_init() (unlikely) sql/item_strfunc.cc: Added comment
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index fd1c928b4fd..a168099e6d6 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -2302,6 +2302,7 @@ static VAR* var_init(VAR* v, const char* name, int name_len, const char* val,
if (!(tmp_var->str_val = my_malloc(val_alloc_len+1, MYF(MY_WME))))
die("Out of memory");
+ /* 'name' may be NULL here, but in this case name_len is 0 */
memcpy(tmp_var->name, name, name_len);
if (val)
{