Merge lp:~fboucault/qtubuntu-camera/fix_rapid_switching_crash into lp:qtubuntu-camera

[Florian Boucault]

Make sure we don't dereference invalid pointers during rapid connect/disconnect sequences.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-ci/110/rebuild

review: Approve (continuous-integration)

[Ugo Riboni (uriboni)]

Code LGTM and testing shows it fixes the bug. Good to go.

review: Approve

=== modified file 'src/aalcameraservice.cpp'
--- src/aalcameraservice.cpp	2014-07-30 19:35:51 +0000
+++ src/aalcameraservice.cpp	2015-01-28 14:12:54 +0000
@@ -178,7 +178,9 @@
 
 void AalCameraService::disconnectCamera()
 {
-    m_service->videoOutputControl()->stopPreview();
+    if (m_service->videoOutputControl()) {
+        m_service->videoOutputControl()->stopPreview();
+    }
 
     if (m_androidControl) {
         android_camera_disconnect(m_androidControl);

=== modified file 'src/aalcamerazoomcontrol.cpp'
--- src/aalcamerazoomcontrol.cpp	2013-07-23 16:02:22 +0000
+++ src/aalcamerazoomcontrol.cpp	2015-01-28 14:12:54 +0000
@@ -91,6 +91,10 @@
 {
     Q_ASSERT(m_service->androidControl());
 
+    if (!m_service->androidControl()) {
+        return;
+    }
+
     resetCurrentZoom();
 
     int maxZoom = 1;

=== modified file 'src/aalimageencodercontrol.cpp'
--- src/aalimageencodercontrol.cpp	2014-12-08 17:13:31 +0000
+++ src/aalimageencodercontrol.cpp	2015-01-28 14:12:54 +0000
@@ -51,8 +51,10 @@
     if (!settings.isNull()) {
         // JPEG quality
         m_encoderSettings.setQuality(settings.quality());
-        int jpegQuality = qtEncodingQualityToJpegQuality(settings.quality());
-        android_camera_set_jpeg_quality(m_service->androidControl(), jpegQuality);
+        if (m_service->androidControl()) {
+            int jpegQuality = qtEncodingQualityToJpegQuality(settings.quality());
+            android_camera_set_jpeg_quality(m_service->androidControl(), jpegQuality);
+        }
 
         // codec
         if (!settings.codec().isNull()) {