commit e6e98e77198a68c812b81159f76de33b632c3d43
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 13 18:15:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 13 18:15:35 2019 +0000
tree 6151108ff813975f812dbd42e60f455e076fdf93
parent 225bf1186c06aeb4a358e8b04729146500eadf1b
parent 14c10ebbf4d05c5dc8ca08371410437f47077bde

Merge "StagefrighRecorder:check mWriter before using fd"

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);
 }