[gvfs] udisks2: Avoid crashes during unmount



commit 1f28d65fd99122a42094a08436a3884133be3c8b
Author: Ondrej Holy <oholy redhat com>
Date:   Sat Feb 6 08:10:31 2016 +0100

    udisks2: Avoid crashes during unmount
    
    Commit c014b64 was pushed to prevent race between unmount reply and
    retry timer. Result of mount operation reply should be stored if
    unmount operation is in progress, however it isn't, because the
    conditional statement is always true. Fix the condition accordingly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678555

 monitor/udisks2/gvfsudisks2mount.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/monitor/udisks2/gvfsudisks2mount.c b/monitor/udisks2/gvfsudisks2mount.c
index dced43a..af91a38 100644
--- a/monitor/udisks2/gvfsudisks2mount.c
+++ b/monitor/udisks2/gvfsudisks2mount.c
@@ -692,7 +692,7 @@ on_mount_op_reply (GMountOperation       *mount_operation,
   data->reply_result = result;
   data->reply_choice = choice;
   data->reply_set = TRUE;
-  if (!data->completed || !data->in_progress)
+  if (!data->completed && !data->in_progress)
     mount_op_reply_handle (data);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]