[glib/glib-2-52] OpenFile support: Handle open failing



commit 098f9c6088ff7d9aad5199294f0b2fc70604eec0
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed May 31 12:10:25 2017 -0400

    OpenFile support: Handle open failing
    
    This can happen, report it as an error when it does.

 gio/gopenuriportal.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/gio/gopenuriportal.c b/gio/gopenuriportal.c
index 973190b..fb8289b 100644
--- a/gio/gopenuriportal.c
+++ b/gio/gopenuriportal.c
@@ -107,6 +107,13 @@ g_openuri_portal_open_uri (const char  *uri,
       path = g_file_get_path (file);
 
       fd = g_open (path, O_PATH | O_CLOEXEC);
+      if (fd == -1)
+        {
+          g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
+                       "Failed to open '%s'", path);
+          return FALSE;
+        }
+
 #ifndef HAVE_O_CLOEXEC
       fcntl (fd, F_SETFD, FD_CLOEXEC);
 #endif
@@ -262,6 +269,14 @@ g_openuri_portal_open_uri_async (const char          *uri,
 
       path = g_file_get_path (file);
       fd = g_open (path, O_PATH | O_CLOEXEC);
+      if (fd == -1)
+        {
+          g_task_report_new_error (NULL, callback, user_data, NULL,
+                                   G_IO_ERROR, g_io_error_from_errno (errno),
+                                   "OpenURI portal is not available");
+          return;
+        }
+
 #ifndef HAVE_O_CLOEXEC
       fcntl (fd, F_SETFD, FD_CLOEXEC);
 #endif


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