aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2011-04-23 14:44:10 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2011-04-23 14:44:10 +0000
commitdaab2741d4608c5a8896efd2d12e67773793712f (patch)
tree0174f8f9adbdd4009c448673cae16288ae68bde3
parent81da16755e7c8ac6e9a037871aa6f8d1b830a4c8 (diff)
downloadperl-URPM-daab2741d4608c5a8896efd2d12e67773793712f.tar
perl-URPM-daab2741d4608c5a8896efd2d12e67773793712f.tar.gz
perl-URPM-daab2741d4608c5a8896efd2d12e67773793712f.tar.bz2
perl-URPM-daab2741d4608c5a8896efd2d12e67773793712f.tar.xz
perl-URPM-daab2741d4608c5a8896efd2d12e67773793712f.zip
check that return value of magic_open() isn't NULL before trying to use it
-rw-r--r--xfile.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/xfile.h b/xfile.h
index 7c26e66..c915e28 100644
--- a/xfile.h
+++ b/xfile.h
@@ -90,8 +90,7 @@ static xFile xOpen(const char *path) {
lzma_ret ret = LZMA_OK;
const char *message, *tmp;
magic_t cookie;
- cookie = magic_open(MAGIC_NONE);
- if(!magic_load(cookie, NULL)) {
+ if ((cookie = magic_open(MAGIC_NONE)) && !magic_load(cookie, NULL)) {
message = magic_file(cookie, path);
if(message == NULL)
xF.type = XF_FAIL;