JSVideo : Fix crash on access to uninitialized properties (width & height)

Author: efyx

src/Binding/JSVideo.cpp

@@ -209,14 +209,22 @@ bool JSVideo::JSGetter_canvas(JSContext *cx, JS::MutableHandleValue vp)
 
 bool JSVideo::JSGetter_width(JSContext *cx, JS::MutableHandleValue vp)
 {
-    vp.setInt32(this->m_Video->m_CodecCtx->width);
+    if (m_Video->m_CodecCtx) {
+        vp.setInt32(m_Video->m_CodecCtx->width);
+    } else {
+        vp.setInt32(-1);
+    }
 
     return true;
 }
 
 bool JSVideo::JSGetter_height(JSContext *cx, JS::MutableHandleValue vp)
 {
-    vp.setInt32(this->m_Video->m_CodecCtx->height);
+    if (m_Video->m_CodecCtx) {
+        vp.setInt32(this->m_Video->m_CodecCtx->height);
+    } else {
+        vp.setInt32(-1);
+    }
 
     return true;
 }

tests/jsunittest/AV/Video.js

@@ -21,6 +21,16 @@ Tests.registerAsync("Video.open(invalid file)", function(next) {
     video.open("invalid");
 }, 5000);
 
+Tests.register("Video access to uninitialized properties", function() {
+    Assert.strictEqual(video.width, -1, "Video width does not match");
+    Assert.strictEqual(video.height, -1, "Video height does not match");
+    Assert.strictEqual(video.duration, 0, "Video duration is incorrect");
+    Assert.strictEqual(video.bitrate, 0, "Unexpected bitrate");
+    Assert.strictEqual(video.metadata, undefined, "File MetaData does not match");
+    Assert.strictEqual(video.getAudioNode(), null, "Node should not be defined");
+});
+
+
 Tests.registerAsync("Video.open", function(next) {
     video.close();
 
@@ -40,6 +50,11 @@ Tests.registerAsync("Video.open", function(next) {
     video.open("AV/video.ogg");
 }, 5000);
 
+Tests.register("Video.width/height", function() {
+    Assert.strictEqual(video.width, 720, "Video width does not match");
+    Assert.strictEqual(video.height, 400, "Video height does not match");
+});
+
 Tests.register("Video.duration", function() {
     Assert.strictEqual(video.duration, 6, "Video duration is incorrect");
 });