diff options
| author | Marco Nelissen <marcone@google.com> | 2017-05-12 21:27:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-12 21:27:13 +0000 |
| commit | e49d1304e7eb294fe71df0aaceb8775879f9de65 (patch) | |
| tree | d8b50a8abc0104228ca97253120bf98c43c0bbf6 | |
| parent | 490b0166e597851e97b1c3ada97b446094c947c2 (diff) | |
| parent | 45712137eab3d0b384be9c1227916b0b2952274e (diff) | |
| download | sonivox-e49d1304e7eb294fe71df0aaceb8775879f9de65.tar.gz | |
Merge "Fix infinite recursion" into klp-dev
am: 45712137ea
Change-Id: I63e7b379d8c771f4fb82ad6a18e9a2dd4e907952
| -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; |