summaryrefslogtreecommitdiff
path: root/regex
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 /regex
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 'regex')
-rw-r--r--regex/reginit.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/regex/reginit.c b/regex/reginit.c
index 18647c386fc..309685fadf2 100644
--- a/regex/reginit.c
+++ b/regex/reginit.c
@@ -49,6 +49,16 @@ void regex_init()
for (i=0; i < CCLASS_LAST ; i++)
{
char *tmp=(char*) malloc(count[i]+1);
+ if (!tmp)
+ {
+ /*
+ This is very unlikely to happen as this function is called once
+ at program startup
+ */
+ fprintf(stderr,
+ "Fatal error: Can't allocate memory in regex_init\n");
+ exit(1);
+ }
memcpy(tmp,buff[i],count[i]*sizeof(char));
tmp[count[i]]=0;
cclasses[i].chars=tmp;