com php-src: use right memory api: ext/fileinfo/libmagic/funcs.c

From: Date: Sun, 08 Mar 2015 18:47:12 +0000
Subject: com php-src: use right memory api: ext/fileinfo/libmagic/funcs.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85352@lists.php.net to get a copy of this message
Commit: 2fd282a690978d3f94b9ca121366530f5e20b935 Author: Anatol Belski <ab@php.net> Thu, 5 Mar 2015 14:12:08 +0100 Parents: f3fad68efd615f3f423e996f9c62f00a01c8e102 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2fd282a690978d3f94b9ca121366530f5e20b935 Log: use right memory api Changed paths: M ext/fileinfo/libmagic/funcs.c Diff: diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c index 6566846..44c3e76 100644 --- a/ext/fileinfo/libmagic/funcs.c +++ b/ext/fileinfo/libmagic/funcs.c @@ -473,7 +473,7 @@ file_push_buffer(struct magic_set *ms) if (ms->event_flags & EVENT_HAD_ERR) return NULL; - if ((pb = (CAST(file_pushbuf_t *, malloc(sizeof(*pb))))) == NULL) + if ((pb = (CAST(file_pushbuf_t *, emalloc(sizeof(*pb))))) == NULL) return NULL; pb->buf = ms->o.buf; @@ -491,8 +491,8 @@ file_pop_buffer(struct magic_set *ms, file_pushbuf_t *pb) char *rbuf; if (ms->event_flags & EVENT_HAD_ERR) { - free(pb->buf); - free(pb); + efree(pb->buf); + efree(pb); return NULL; } @@ -501,7 +501,7 @@ file_pop_buffer(struct magic_set *ms, file_pushbuf_t *pb) ms->o.buf = pb->buf; ms->offset = pb->offset; - free(pb); + efree(pb); return rbuf; }

« previous php.cvs (#85352) next »