summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_loaddata.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2010-05-31 17:09:13 +0000
committerAndrey Hristov <andrey@php.net>2010-05-31 17:09:13 +0000
commitb61d7501c9b5ca0630df4b128a2ab25f20875ca7 (patch)
treecc2fd677d024e45f220d9632744d6d53e026a046 /ext/mysqlnd/mysqlnd_loaddata.c
parent4cd5db922b45b4e4b3e0fb042a5ed13ac2f7efd0 (diff)
downloadphp-git-b61d7501c9b5ca0630df4b128a2ab25f20875ca7.tar.gz
Bail if allocation fails
Diffstat (limited to 'ext/mysqlnd/mysqlnd_loaddata.c')
-rw-r--r--ext/mysqlnd/mysqlnd_loaddata.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c
index 267c3b8b7e..1885cbc6d0 100644
--- a/ext/mysqlnd/mysqlnd_loaddata.c
+++ b/ext/mysqlnd/mysqlnd_loaddata.c
@@ -53,7 +53,12 @@ int mysqlnd_local_infile_init(void **ptr, char *filename, void **userdata TSRMLS
DBG_ENTER("mysqlnd_local_infile_init");
- *ptr = info = ((MYSQLND_INFILE_INFO *)mnd_ecalloc(1, sizeof(MYSQLND_INFILE_INFO)));
+ info = ((MYSQLND_INFILE_INFO *)mnd_ecalloc(1, sizeof(MYSQLND_INFILE_INFO)));
+ if (!info) {
+ DBG_RETURN(1);
+ }
+
+ *ptr = info;
/* check open_basedir */
if (PG(open_basedir)) {