diff options
| author | Marco Nelissen <marcone@google.com> | 2015-05-07 00:20:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-07 00:20:52 +0000 |
| commit | 1e5670abf9c1b714819ab6ec529a6bc19cbdacf4 (patch) | |
| tree | 8dbbd8d07f670ca1c56a6519d80b38fb5f61b5eb | |
| parent | 85bb3235ef58120131e20801dd37eb9708ddc570 (diff) | |
| parent | 296dc6708cbcdc183025500f104defe17380be37 (diff) | |
| download | frameworks_av-1e5670abf9c1b714819ab6ec529a6bc19cbdacf4.zip frameworks_av-1e5670abf9c1b714819ab6ec529a6bc19cbdacf4.tar.gz frameworks_av-1e5670abf9c1b714819ab6ec529a6bc19cbdacf4.tar.bz2 | |
am 296dc670: am d8e41553: am bd28ac74: am 59cea261: Add some sanity checks
* commit '296dc6708cbcdc183025500f104defe17380be37':
Add some sanity checks
| -rw-r--r-- | media/libmedia/IMediaHTTPConnection.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/media/libmedia/IMediaHTTPConnection.cpp b/media/libmedia/IMediaHTTPConnection.cpp index 7e26ee6..a5a3714 100644 --- a/media/libmedia/IMediaHTTPConnection.cpp +++ b/media/libmedia/IMediaHTTPConnection.cpp @@ -24,6 +24,7 @@ #include <binder/Parcel.h> #include <utils/String8.h> #include <media/stagefright/foundation/ADebug.h> +#include <media/stagefright/MediaErrors.h> namespace android { @@ -106,11 +107,18 @@ struct BpMediaHTTPConnection : public BpInterface<IMediaHTTPConnection> { return UNKNOWN_ERROR; } - int32_t len = reply.readInt32(); + size_t len = reply.readInt32(); - if (len > 0) { - memcpy(buffer, mMemory->pointer(), len); + if (len > size) { + ALOGE("requested %zu, got %zu", size, len); + return ERROR_OUT_OF_RANGE; } + if (len > mMemory->size()) { + ALOGE("got %zu, but memory has %zu", len, mMemory->size()); + return ERROR_OUT_OF_RANGE; + } + + memcpy(buffer, mMemory->pointer(), len); return len; } |