From 82b2a31343a1815c52ae5b966b6b747349f9e42f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 Dec 2003 00:00:20 +0200 Subject: 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 --- regex/reginit.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'regex/reginit.c') 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; -- cgit v1.2.1