1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index 1f9c725d0..bb451fa0f 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -636,6 +636,14 @@ public abstract class LocalMediaData implements LocalData {
             int height = c.getInt(COL_HEIGHT);
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
             String rotation = null;
+
+            File origFile = new File(path);
+            if (!origFile.exists() || origFile.length() <= 0) {
+                Log.e(TAG, "Invalid video file");
+                retriever.release();
+                return null;
+            }
+
             try {
                 retriever.setDataSource(path);
             } catch (RuntimeException ex) {