commit 14c10ebbf4d05c5dc8ca08371410437f47077bde
author Gopalakrishnan Nallasamy <gokrishnan@google.com> Sat Mar 09 13:33:41 2019 -0800
committer Gopalakrishnan Nallasamy <gokrishnan@google.com> Tue Mar 12 20:08:48 2019 -0700
tree 5672a7254d5843fae9b40a40dcf010758959756a
parent baf2d2c69a281803c039c92b74cf8d7223f88c48

StagefrighRecorder:check mWriter before using fd

ftruncate(fd) would be useless if mWriter was NULL already.
Hence moved mWriter nullptr check before ftruncate(fd).

Bug: 128366317

Test: atest CtsMediaTestCases:android.media.cts.MediaRecorderTest

Change-Id: I46b8c4718bc8a90712b7ec0b54d8239106106018

media/libmediaplayerservice/StagefrightRecorder.cpp

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 624f596..77777b8 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -400,12 +400,14 @@
         return -EBADF;
     }
 
-    // start with a clean, empty file
-    ftruncate(fd, 0);
-    if (mWriter == NULL) {
+    if (mWriter == nullptr) {
         ALOGE("setNextOutputFile failed. Writer has been freed");
         return INVALID_OPERATION;
     }
+
+    // start with a clean, empty file
+    ftruncate(fd, 0);
+
     return mWriter->setNextFd(fd);
 }