OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
81bd788
)
FileSource may fail to open a file in which case subsequent code dereferences a NULL...
author
Andreas Huber
<andih@google.com>
Wed, 27 Oct 2010 17:33:04 +0000
(10:33 -0700)
committer
Andreas Huber
<andih@google.com>
Wed, 27 Oct 2010 17:33:04 +0000
(10:33 -0700)
Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683
media/libstagefright/FileSource.cpp
patch
|
blob
|
history
diff --git
a/media/libstagefright/FileSource.cpp
b/media/libstagefright/FileSource.cpp
index
b46d8d0
..
e4f9a47
100644
(file)
--- a/
media/libstagefright/FileSource.cpp
+++ b/
media/libstagefright/FileSource.cpp
@@
-21,7
+21,7
@@
namespace android {
FileSource::FileSource(const char *filename)
: mFile(fopen(filename, "rb")),
- mFd(fileno(mFile)),
+ mFd(
mFile == NULL ? -1 :
fileno(mFile)),
mOffset(0),
mLength(-1),
mDecryptHandle(NULL),