coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Jpeg invalid step by 2

Browse Source 
BUG=210
TESTED=out\release\libyuv_unittest --gtest_filter=*J*
Review URL: https://webrtc-codereview.appspot.com/1276005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@632 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-04-02 18:34:23 +00:00
parent 87adfaa61e
commit 4ffd9127bd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 631 Version: 632
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 631 #define LIBYUV_VERSION 632
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

10
source/mjpeg_decoder.cc
View File

@ -86,10 +86,14 @@ bool ValidateJpeg(const uint8* sample, size_t sample_size) {
// ERROR: Invalid jpeg initial start code // ERROR: Invalid jpeg initial start code
return false; return false;
} }
for (int i = static_cast<int>(sample_size) - 1; i > 2; --i) { for (int i = static_cast<int>(sample_size) - 2; i > 1;) {
if (sample[i - 1] == 0xff && sample[i] == 0xd9) { // End Of Image if (sample[i] != 0xd9) {
return true; if (sample[i] == 0xff && sample[i + 1] == 0xd9) { // End Of Image
return true;
}
--i;
} }
--i;
} }
// ERROR: Invalid jpeg end code not found. Size sample_size // ERROR: Invalid jpeg end code not found. Size sample_size
return false; return false;