diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 09:43:25 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 10:18:51 +0100 |
| commit | 90312b5d618cc263f58de41e6345ddf3c8c57b03 (patch) | |
| tree | eacc140dcb9cd5c9cd39aec786c1ceec9a6d30b7 /libmsi/libmsi-database.c | |
| parent | 4e14d3dff17f798dfed9e69f759cdfa6103ff03a (diff) | |
| parent | b03fdf4bd446b62a3eb72c7c9279031a8297f53e (diff) | |
| download | msitools-90312b5d618cc263f58de41e6345ddf3c8c57b03.tar.gz msitools-90312b5d618cc263f58de41e6345ddf3c8c57b03.tar.xz msitools-90312b5d618cc263f58de41e6345ddf3c8c57b03.zip | |
Merge branch 'pre-gsf'
Conflicts:
libmsi/libmsi-database.c
Diffstat (limited to 'libmsi/libmsi-database.c')
| -rw-r--r-- | libmsi/libmsi-database.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c index 450e512..8dad791 100644 --- a/libmsi/libmsi-database.c +++ b/libmsi/libmsi-database.c @@ -1150,14 +1150,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; - char **columns; - char **types; - char **labels; + unsigned num_labels = 0; + unsigned num_types = 0; + unsigned num_columns = 0; + unsigned num_records = 0; + char *path = NULL; + char **columns = NULL; + char **types = NULL; + char **labels = NULL; char *ptr; - char *data; + char *data = NULL; char ***records = NULL; char ***temp_records; |