diff options
| author | Marco Nelissen <marcone@google.com> | 2017-05-12 21:56:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-12 21:56:47 +0000 |
| commit | f0aa0bd60932b2cb6b56776ddedb8418e01e06e5 (patch) | |
| tree | 95ab0779ef76842fd143861fb7b6d4b6a3ee1a6f | |
| parent | 06ed8e890da763e99abec6094e4c42e048163668 (diff) | |
| parent | a681031d286accf3d24f74cabd51cf216cf31844 (diff) | |
| download | sonivox-f0aa0bd60932b2cb6b56776ddedb8418e01e06e5.tar.gz | |
Merge "Fix infinite recursion" into klp-dev am: 45712137ea am: e49d1304e7 am: 6483a95ccf am: bb6bfa8f5a am: e090def747 am: cd0a4ac609 am: 3454ab70d6 am: 219f65ba81 am: 016843f3e3 am: 0ca627b3f5 am: fe21703054 am: 052785ce3b
am: a681031d28
Change-Id: Ia1944b59db8fd09ea9bedc35afffbe553e3f62d6
| -rw-r--r-- | arm-wt-22k/lib_src/eas_xmf.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arm-wt-22k/lib_src/eas_xmf.c b/arm-wt-22k/lib_src/eas_xmf.c index 830b6e5..169eb7e 100644 --- a/arm-wt-22k/lib_src/eas_xmf.c +++ b/arm-wt-22k/lib_src/eas_xmf.c @@ -27,6 +27,8 @@ *---------------------------------------------------------------------------- */ +#include <log/log.h> + #include "eas_data.h" #include "eas_miditypes.h" #include "eas_parser.h" @@ -649,6 +651,11 @@ static EAS_RESULT XMF_ReadNode (EAS_HW_DATA_HANDLE hwInstData, S_XMF_DATA *pXMFD for ( ; numItems > 0; numItems--) { /* process this item */ + if (offset <= nodeOffset) { + ALOGE("b/36725407: parser did not advance"); + return EAS_ERROR_FILE_FORMAT; + } + if ((result = XMF_ReadNode(hwInstData, pXMFData, offset, &length)) != EAS_SUCCESS) return result; |