diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-15 08:44:39 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-15 08:44:40 -0700 |
commit | 09a0c67023c010aec72faa71f116199da4b0f39e (patch) | |
tree | 27c75103cdb2f6ff912a7eb355999a3e92eff2a9 | |
parent | e6d06460f6936adaf2c5df783700a683fd082878 (diff) | |
parent | a965c0d917b2b2ef9dbd1c773098e3de079be4fd (diff) | |
download | android_external_sonivox-09a0c67023c010aec72faa71f116199da4b0f39e.tar.gz android_external_sonivox-09a0c67023c010aec72faa71f116199da4b0f39e.tar.bz2 android_external_sonivox-09a0c67023c010aec72faa71f116199da4b0f39e.zip |
Merge "There is fd leak in sonivox lib when try open any media file > 2GB (MIDI parser memory leak)"
-rw-r--r-- | arm-wt-22k/lib_src/eas_public.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arm-wt-22k/lib_src/eas_public.c b/arm-wt-22k/lib_src/eas_public.c index 8195b98..51ac423 100644 --- a/arm-wt-22k/lib_src/eas_public.c +++ b/arm-wt-22k/lib_src/eas_public.c @@ -630,8 +630,11 @@ EAS_PUBLIC EAS_RESULT EAS_OpenFile (EAS_DATA_HANDLE pEASData, EAS_FILE_LOCATOR l /* allocate a stream */ if ((streamNum = EAS_AllocateStream(pEASData)) < 0) + { + /* Closing the opened file as stream allocation failed */ + EAS_HWCloseFile(pEASData->hwInstData, fileHandle); return EAS_ERROR_MAX_STREAMS_OPEN; - + } /* check Configuration Module for file parsers */ pParserModule = NULL; *ppStream = NULL; @@ -645,6 +648,9 @@ EAS_PUBLIC EAS_RESULT EAS_OpenFile (EAS_DATA_HANDLE pEASData, EAS_FILE_LOCATOR l /* see if this parser recognizes it */ if ((result = (*pParserModule->pfCheckFileType)(pEASData, fileHandle, &streamHandle, 0L)) != EAS_SUCCESS) { + /* Closing the opened file as file type check failed */ + EAS_HWCloseFile(pEASData->hwInstData, fileHandle); + { /* dpp: EAS_ReportEx(_EAS_SEVERITY_ERROR, "CheckFileType returned error %ld\n", result); */ } return result; } @@ -661,7 +667,12 @@ EAS_PUBLIC EAS_RESULT EAS_OpenFile (EAS_DATA_HANDLE pEASData, EAS_FILE_LOCATOR l /* rewind the file for the next parser */ if ((result = EAS_HWFileSeek(pEASData->hwInstData, fileHandle, 0L)) != EAS_SUCCESS) + { + /* Closing the opened file as file seek failed */ + EAS_HWCloseFile(pEASData->hwInstData, fileHandle); + return result; + } } /* no parser was able to recognize the file, close it and return an error */ |