From a830452779d5a8db4d9563386858e0be797d2de8 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 4 Nov 2015 10:54:29 +0000 Subject: [PATCH] Prevented a potentially severe memory error with disk file pattern expansion. Coverity CID 28765. --- xorriso/match.c | 2 +- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xorriso/match.c b/xorriso/match.c index 4bca3b00..b734c6d6 100644 --- a/xorriso/match.c +++ b/xorriso/match.c @@ -694,7 +694,7 @@ int Xorriso_expand_disk_pattern(struct XorrisO *xorriso, goto ex; count+= extra_filec; - mem+= extra_filec*sizeof(char *); + (*mem)+= extra_filec * sizeof(char *); if(count<=0) {ret= 0; goto ex;} diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index eb8031e7..7de77e26 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2015.11.04.100839" +#define Xorriso_timestamP "2015.11.04.105349"