diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-01-25 11:42:36 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-01-25 11:45:14 +0800 |
| commit | 4cb47bd3bdc8cffe0bfb26fe4856eee4ec33dae2 (patch) | |
| tree | cd5b6c8597b9ecf69badda9f644b1da911da46da /ext/fileinfo/libmagic/softmagic.c | |
| parent | da7f42de38e02f49aa156d4717385f9a157222ce (diff) | |
| download | php-git-4cb47bd3bdc8cffe0bfb26fe4856eee4ec33dae2.tar.gz | |
Fixed compiler warnings
Diffstat (limited to 'ext/fileinfo/libmagic/softmagic.c')
| -rw-r--r-- | ext/fileinfo/libmagic/softmagic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index 9e876d39b3..41c4aa17d7 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -2040,7 +2040,7 @@ magiccheck(struct magic_set *ms, struct magic *m) /* Need to fetch global match which equals pmatch[0] */ zval *pzval; HashTable *ht = Z_ARRVAL(subpats); - if ((pzval = zend_hash_index_find(ht, 0)) != NULL) { + if ((pzval = zend_hash_index_find(ht, 0)) != NULL && Z_TYPE_P(pzval) == IS_ARRAY) { /* If everything goes according to the master plan tmpcopy now contains two elements: 0 = the match |