[vlc-commits] macosx: fix potential null pointer dereference

Felix Paul Kühne git at videolan.org
Sun Jun 10 10:35:42 CEST 2018


vlc/vlc-3.0 | branch: master | Felix Paul Kühne <felix at feepk.net> | Sat Jun  9 16:17:55 2018 +0200| [b20024a758c5f3137e4768f451001d39154e8ec7] | committer: Felix Paul Kühne

macosx: fix potential null pointer dereference

(cherry picked from commit 864b5584f69d307b477d74c0a9a9df5d3836a61d)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b20024a758c5f3137e4768f451001d39154e8ec7
---

 modules/gui/macosx/VLCVoutView.m | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCVoutView.m b/modules/gui/macosx/VLCVoutView.m
index 4952afe18b..658c193e50 100644
--- a/modules/gui/macosx/VLCVoutView.m
+++ b/modules/gui/macosx/VLCVoutView.m
@@ -76,11 +76,10 @@
 {
     if (self = [super initWithFrame:frameRect]) {
         [self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
+        i_lastScrollWheelDirection = 0;
+        f_cumulated_magnification = 0.0;
     }
 
-    i_lastScrollWheelDirection = 0;
-    f_cumulated_magnification = 0.0;
-
     return self;
 }
 



More information about the vlc-commits mailing list