summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-07-16 10:58:30 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-07-16 10:58:30 +0000
commit48cd6930f1bdca7ec4293e9cef99efc597ad682d (patch)
treee79bff08b3248dfb58d9a8357b329d4b4a0590da /legacy
parentecffd3ae2ff932dadd93ac29531541bb3c8799d4 (diff)
eet: fix possible wrong size decoding for simple type.
SVN revision: 73923
Diffstat (limited to 'legacy')
-rw-r--r--legacy/eet/ChangeLog1
-rw-r--r--legacy/eet/NEWS1
-rw-r--r--legacy/eet/src/lib/eet_data.c4
3 files changed, 4 insertions, 2 deletions
diff --git a/legacy/eet/ChangeLog b/legacy/eet/ChangeLog
index 18d8ff2..0ce223a 100644
--- a/legacy/eet/ChangeLog
+++ b/legacy/eet/ChangeLog
@@ -606,3 +606,4 @@
6062012-07-16 Cedric Bail 6062012-07-16 Cedric Bail
607 607
608 * Add code to detect overrun and underrun in eet_data_descriptor_element_add. 608 * Add code to detect overrun and underrun in eet_data_descriptor_element_add.
609 * Fix possible wrong size decoding for simple type.
diff --git a/legacy/eet/NEWS b/legacy/eet/NEWS
index 6a08a57..456bd180 100644
--- a/legacy/eet/NEWS
+++ b/legacy/eet/NEWS
@@ -11,6 +11,7 @@ Fixes:
11 * Make eet_dictionary thread safe. 11 * Make eet_dictionary thread safe.
12 * Check that gnutls and openssl don't return below zero size during decipher. 12 * Check that gnutls and openssl don't return below zero size during decipher.
13 * Fix crash when cyphering huge amount of data. 13 * Fix crash when cyphering huge amount of data.
14 * Possible wrong size decoding of simple type.
14 15
15Eet 1.6.0 16Eet 1.6.0
16 17
diff --git a/legacy/eet/src/lib/eet_data.c b/legacy/eet/src/lib/eet_data.c
index 1eb822a..bd6bbd9 100644
--- a/legacy/eet/src/lib/eet_data.c
+++ b/legacy/eet/src/lib/eet_data.c
@@ -3698,7 +3698,7 @@ eet_data_get_array(Eet_Free_Context *context,
3698 if (ede) 3698 if (ede)
3699 { 3699 {
3700 if (IS_POINTER_TYPE(type)) 3700 if (IS_POINTER_TYPE(type))
3701 subsize = eet_basic_codec[ede->type].size; 3701 subsize = eet_basic_codec[ede->type - 1].size;
3702 else 3702 else
3703 subsize = ede->subtype->size; 3703 subsize = ede->subtype->size;
3704 3704
@@ -4417,7 +4417,7 @@ eet_data_put_array(Eet_Dictionary *ed,
4417 eet_data_encode(ed, ds, data, ede->name, size, ede->type, ede->group_type); 4417 eet_data_encode(ed, ds, data, ede->name, size, ede->type, ede->group_type);
4418 4418
4419 if (IS_POINTER_TYPE(ede->type)) 4419 if (IS_POINTER_TYPE(ede->type))
4420 subsize = eet_basic_codec[ede->type].size; 4420 subsize = eet_basic_codec[ede->type - 1].size;
4421 else 4421 else
4422 subsize = ede->subtype->size; 4422 subsize = ede->subtype->size;
4423 4423