diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index e3da5119e..f8f012b12 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 27 23:54:46 CEST 2005 (tk)
+----------------------------------
+  * libclamav/upx.c: add sanity check to pefromupx()
+
 Tue Apr 26 19:37:24 CEST 2005 (tk)
 ----------------------------------
   * libclamav/readdb.c: improve parsing of broken signatures (bug reported by
diff --git a/clamav-devel/libclamav/upx.c b/clamav-devel/libclamav/upx.c
index 66fe7ff34..04f4267e8 100644
--- a/clamav-devel/libclamav/upx.c
+++ b/clamav-devel/libclamav/upx.c
@@ -76,6 +76,9 @@ int pefromupx (char *src, char *dst, int *dsize, uint32_t ep, uint32_t upx0, uin
   int sectcnt, upd=1, realstuffsz;
   int foffset=0xd0+0xf8;
 
+  if((dst == NULL) || (src == NULL))
+    return 0;
+
   imports = dst + cli_readint32(src + ep - upx1 + magic);
 
   realstuffsz = imports-dst;