summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/format/dex/dex-int.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 188a52d..be7f7e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
17-08-27 Cyrille Bagard <nocbos@gmail.com>
+ * src/format/dex/dex-int.c:
+ Ensure a string is properly loaded as expected before returning success.
+
+17-08-27 Cyrille Bagard <nocbos@gmail.com>
+
* plugins/pychrysa/format/format.c:
* src/arch/processor.h:
Update code.
diff --git a/src/format/dex/dex-int.c b/src/format/dex/dex-int.c
index 811cf5d..043d8cc 100644
--- a/src/format/dex/dex-int.c
+++ b/src/format/dex/dex-int.c
@@ -159,7 +159,10 @@ bool read_dex_string_data_item(const GDexFormat *format, vmpa2t *pos, string_dat
result = g_binary_content_read_uleb128(content, pos, &str_data->utf16_size);
if (result)
+ {
str_data->data = g_binary_content_get_raw_access(content, pos, str_data->utf16_size);
+ result = (str_data->data != NULL);
+ }
return result;