Merge lp:~laney/ubuntu-system-settings/lp1375988 into lp:ubuntu-system-settings

[Iain Lane]

[storage/about] Use a QSharedPointer to manage freeing of the counter which we use to display all of the collected sizes at once. If the measuring process was cancelled, we were freeing it multiple times - once for each outstanding size measurement. This led to a crash.

Use a QSharedPointer to properly manage the shared counter.

We were freeing it multiple times if the space measuring was cancelled.

[lp:~laney/ubuntu-system-settings/lp1375988]

1104. By Iain Lane on 2014-10-02

Remove stray include for testing

[Sebastien Bacher (seb128)]

Thanks, that seems to do the trick

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1104
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1595/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5433
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3892
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6685
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6685/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4209
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4209/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1595/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2014-09-24 12:29:57 +0000
+++ plugins/about/storageabout.cpp	2014-10-02 16:35:54 +0000
@@ -43,18 +43,20 @@
 }
 
 struct MeasureData {
-    uint *running;
+    QSharedPointer<quint32> running;
     StorageAbout *object;
     quint64 *size;
     GCancellable *cancellable;
-    MeasureData (uint *running,
+    MeasureData (QSharedPointer<quint32> running,
                  StorageAbout *object,
                  quint64 *size,
                  GCancellable *cancellable):
         running(running),
         object(object),
         size(size),
-        cancellable(cancellable){}
+        cancellable(cancellable){
+            ++(*running);
+        }
 };
 
 static void measure_file(const char * filename,
@@ -84,19 +86,6 @@
     measure_file (g_get_user_special_dir (directory), callback, user_data);
 }
 
-static void maybeEmit(MeasureData *data)
-{
-    --(*data->running);
-
-    if (*data->running == 0) {
-        Q_EMIT (data->object->sizeReady());
-        delete data->running;
-    }
-
-    delete data;
-
-}
-
 static void measure_finished(GObject *source_object,
                              GAsyncResult *result,
                              gpointer user_data)
@@ -118,20 +107,24 @@
 
     if (err != nullptr) {
         if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-            delete data->running;
             delete data;
-            g_object_unref (file);
+            g_clear_object (&file);
             g_error_free (err);
+            err = nullptr;
             return;
         } else {
             qWarning() << "Measuring of" << g_file_get_path (file)
                        << "failed:" << err->message;
-            g_error_free(err);
+            g_error_free (err);
+            err = nullptr;
         }
     }
 
-    g_object_unref (file);
-    maybeEmit(data);
+    if (--(*data->running) == 0)
+        Q_EMIT (data->object->sizeReady());
+
+    delete data;
+    g_clear_object (&file);
 }
 
 StorageAbout::StorageAbout(QObject *parent) :
@@ -310,7 +303,8 @@
 
 void StorageAbout::populateSizes()
 {
-    uint *running = new uint(0);
+    quint32 *running = new quint32(0);
+    QSharedPointer<quint32> running_ptr(running);
 
     if (!m_cancellable)
         m_cancellable = g_cancellable_new();
@@ -318,25 +312,25 @@
     measure_special_file(
                 G_USER_DIRECTORY_VIDEOS,
                 measure_finished,
-                new MeasureData(&++(*running), this, &m_moviesSize,
+                new MeasureData(running_ptr, this, &m_moviesSize,
                                 m_cancellable));
 
     measure_special_file(
                 G_USER_DIRECTORY_MUSIC,
                 measure_finished,
-                new MeasureData(&++(*running), this, &m_audioSize,
+                new MeasureData(running_ptr, this, &m_audioSize,
                                 m_cancellable));
 
     measure_special_file(
                 G_USER_DIRECTORY_PICTURES,
                 measure_finished,
-                new MeasureData(&++(*running), this, &m_picturesSize,
+                new MeasureData(running_ptr, this, &m_picturesSize,
                                 m_cancellable));
 
     measure_file(
                 g_get_home_dir(),
                 measure_finished,
-                new MeasureData(&++(*running), this, &m_homeSize,
+                new MeasureData(running_ptr, this, &m_homeSize,
                                 m_cancellable));
 }