admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check for ftell return value.

Browse Source 
BUG=C-10170

Review URL: https://webrtc-codereview.appspot.com/355001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1450 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2012-01-18 09:36:46 +00:00
parent cdeb483c6a
commit 8224451ee4
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/video_engine/vie_file_image.cc
View File

@ -35,9 +35,29 @@ int ViEFileImage::ConvertJPEGToVideoFrame(int engine_id,
"%s could not open file %s", __FUNCTION__, file_nameUTF8);
return -1;
}
fseek(image_file, 0, SEEK_END);
image_buffer._size = ftell(image_file);
fseek(image_file, 0, SEEK_SET);
if (fseek(image_file, 0, SEEK_END) != 0) {
fclose(image_file);
WEBRTC_TRACE(kTraceError, kTraceVideo, engine_id,
"ConvertJPEGToVideoFrame fseek SEEK_END error for file %s",
file_nameUTF8);
return -1;
}
int buffer_size = ftell(image_file);
if (buffer_size == -1) {
fclose(image_file);
WEBRTC_TRACE(kTraceError, kTraceVideo, engine_id,
"ConvertJPEGToVideoFrame could tell file size for file %s",
file_nameUTF8);
return -1;
}
image_buffer._size = buffer_size;
if (fseek(image_file, 0, SEEK_SET) != 0) {
fclose(image_file);
WEBRTC_TRACE(kTraceError, kTraceVideo, engine_id,
"ConvertJPEGToVideoFrame fseek SEEK_SET error for file %s",
file_nameUTF8);
return -1;
}
image_buffer._buffer = new WebRtc_UWord8[ image_buffer._size + 1];
if (image_buffer._size != fread(image_buffer._buffer, sizeof(WebRtc_UWord8),
image_buffer._size, image_file)) {