From ec4924620d3a9bccd4a58cbd5ed9efba3cbef73a Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 16 Dec 2024 12:11:27 +0100
Subject: [PATCH] System: Configuration: Backups - catch php errors for GDrive,
 closes https://github.com/opnsense/core/issues/8135

---
 src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php b/src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php
index 88bf83f2f..089ff08cd 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Backup/GDrive.php
@@ -195,7 +195,7 @@ class Gdrive extends Base implements IBackupProvider
                         (string)$config->system->remotebackup->GDriveEmail,
                         (string)$config->system->remotebackup->GDriveP12key
                     );
-                } catch (Exception $e) {
+                } catch (\Error | \Exception $e) {
                     syslog(LOG_ERR, "error connecting to Google Drive");
                     return array();
                 }
@@ -207,7 +207,7 @@ class Gdrive extends Base implements IBackupProvider
                 // read filelist ({prefix}*.xml)
                 try {
                     $files = $client->listFiles((string)$config->system->remotebackup->GDriveFolderID);
-                } catch (Exception $e) {
+                } catch (\Error | \Exception $e) {
                     syslog(LOG_ERR, "error while fetching filelist from Google Drive");
                     return array();
                 }
@@ -240,7 +240,7 @@ class Gdrive extends Base implements IBackupProvider
                         if ($bck_data == $confdata) {
                             $target_filename = null;
                         }
-                    } catch (Exception $e) {
+                    } catch (\Error | \Exception $e) {
                         syslog(LOG_ERR, "unable to download " .
                             $configfiles[array_keys($configfiles)[0]]->description . " from Google Drive (" . $e . ")");
                     }
@@ -253,7 +253,7 @@ class Gdrive extends Base implements IBackupProvider
                             $target_filename,
                             $confdata_enc
                         );
-                    } catch (Exception $e) {
+                    } catch (\Error | \Exception $e) {
                         syslog(LOG_ERR, "unable to upload " . $target_filename . " to Google Drive (" . $e . ")");
                         return array();
                     }