summaryrefslogtreecommitdiffstats
path: root/libmsi/libmsi-database.c
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2012-12-11 00:10:14 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2012-12-11 09:42:45 +0100
commitb03fdf4bd446b62a3eb72c7c9279031a8297f53e (patch)
treede830bacf8b57ecd6fd0cadc4c9f77fd6acb2236 /libmsi/libmsi-database.c
parent92243bbcde2f22b3ada7b665acc70382de369ddb (diff)
downloadmsitools-b03fdf4bd446b62a3eb72c7c9279031a8297f53e.tar.gz
msitools-b03fdf4bd446b62a3eb72c7c9279031a8297f53e.tar.xz
msitools-b03fdf4bd446b62a3eb72c7c9279031a8297f53e.zip
database: avoid free of uninitialzed variables
Diffstat (limited to 'libmsi/libmsi-database.c')
-rw-r--r--libmsi/libmsi-database.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c
index e4bafc0..a593229 100644
--- a/libmsi/libmsi-database.c
+++ b/libmsi/libmsi-database.c
@@ -1263,14 +1263,16 @@ static unsigned _libmsi_database_import(LibmsiDatabase *db, const char *folder,
{
unsigned r = LIBMSI_RESULT_OUTOFMEMORY;
unsigned len, i;
- unsigned num_labels, num_types;
- unsigned num_columns, num_records = 0;
- char *path;
- WCHAR **columns;
- WCHAR **types;
- WCHAR **labels;
+ unsigned num_labels = 0;
+ unsigned num_types = 0;
+ unsigned num_columns = 0;
+ unsigned num_records = 0;
+ char *path = NULL;
+ WCHAR **columns = NULL;
+ WCHAR **types = NULL;
+ WCHAR **labels = NULL;
WCHAR *ptr;
- WCHAR *data;
+ WCHAR *data = NULL;
WCHAR ***records = NULL;
WCHAR ***temp_records;