summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-02-08 16:07:42 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-08 16:07:42 -0800
commit37865df43b68ae34ddb6f6450dbef301f92f3618 (patch)
tree4d7a770c88ef67d31abcf57593037e8bc1d01847 /media
parent6b8ef4762a26cb828e0a597719764d3d0404e2b1 (diff)
parent27944ef5cd8d0fb476c8c8958986e827c5f8ab83 (diff)
downloadframeworks_av-37865df43b68ae34ddb6f6450dbef301f92f3618.zip
frameworks_av-37865df43b68ae34ddb6f6450dbef301f92f3618.tar.gz
frameworks_av-37865df43b68ae34ddb6f6450dbef301f92f3618.tar.bz2
Merge "Should reset errno to 0 before calling strtoll()."
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/StagefrightRecorder.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index f134cba..87fdbf2 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -244,6 +244,10 @@ status_t StagefrightRecorder::setOutputFileAuxiliary(int fd) {
// returns true on success, false otherwise.
static bool safe_strtoi64(const char *s, int64_t *val) {
char *end;
+
+ // It is lame, but according to man page, we have to set errno to 0
+ // before calling strtoll().
+ errno = 0;
*val = strtoll(s, &end, 10);
if (end == s || errno == ERANGE) {