summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Figuiere <hub@figuiere.net>2009-05-15 15:30:41 -0400
committerHubert Figuiere <hub@figuiere.net>2009-05-15 15:30:41 -0400
commitbfd888e3545f0b1b87f0fc5c6a88933bd5063cf8 (patch)
tree34864620fcf9b3cf84f41f29ff1340e6c0be6ded
parent0c34328019436e1f82f0948c7187943eafd17b40 (diff)
Fix crash in the factory extension list code.
-rw-r--r--ChangeLog6
-rw-r--r--lib/rawfilefactory.cpp3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e88c01..db420cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-15 Hubert Figuiere <hub@figuiere.net>
+
+ Fix crash in the factory extension list code.
+
+ * lib/rawfilefactory.cpp
+
2009-05-13 Hubert Figuiere <hub@figuiere.net>
* include/libopenraw/consts.h:
diff --git a/lib/rawfilefactory.cpp b/lib/rawfilefactory.cpp
index 76ec699..5440865 100644
--- a/lib/rawfilefactory.cpp
+++ b/lib/rawfilefactory.cpp
@@ -75,8 +75,7 @@ const char **RawFileFactory::fileExtensions()
if(!_fileExtensions) {
Extensions & ext = extensions();
size_t s = ext.size();
- _fileExtensions = (const char**)malloc(s + 1);
- _fileExtensions[s] = NULL;
+ _fileExtensions = (const char**)calloc((s + 1), sizeof(char*));
const char **current = _fileExtensions;
Extensions::const_iterator iter(ext.begin());
for ( ; iter != ext.end(); ++iter) {