Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Unified Diff: media/filters/in_memory_url_protocol.cc

Issue 253923002: Fix InMemoryUrlProtocol available_bytes computation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Exclude unittest on Android Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/filters/in_memory_url_protocol_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/in_memory_url_protocol.cc
diff --git a/media/filters/in_memory_url_protocol.cc b/media/filters/in_memory_url_protocol.cc
index 85fa290e501988e480598f4f65f66dc28c45aa40..da8a7dd8da9c2c84ecae753d188e5e65746c83a8 100644
--- a/media/filters/in_memory_url_protocol.cc
+++ b/media/filters/in_memory_url_protocol.cc
@@ -4,6 +4,8 @@
#include "media/filters/in_memory_url_protocol.h"
+#include "media/ffmpeg/ffmpeg_common.h"
+
namespace media {
InMemoryUrlProtocol::InMemoryUrlProtocol(const uint8* data, int64 size,
@@ -17,12 +19,18 @@ InMemoryUrlProtocol::InMemoryUrlProtocol(const uint8* data, int64 size,
InMemoryUrlProtocol::~InMemoryUrlProtocol() {}
int InMemoryUrlProtocol::Read(int size, uint8* data) {
- int available_bytes = size_ - position_;
+ if (size < 0)
+ return AVERROR(EIO);
+
+ int64 available_bytes = size_ - position_;
if (size > available_bytes)
size = available_bytes;
- memcpy(data, data_ + position_, size);
- position_ += size;
+ if (size > 0) {
+ memcpy(data, data_ + position_, size);
+ position_ += size;
+ }
+
return size;
}
« no previous file with comments | « no previous file | media/filters/in_memory_url_protocol_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698