| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 1 | From 9c7654e063d65fb2645459a32fd14eebab484857 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 1 Mar 2023 15:50:26 -0800 |
| 4 | Subject: [PATCH] vtepty.cc: Do not typecast to GSpawnFlags |
| 5 | |
| 6 | GSpawnFlags is enum with max value 1 << 15 which means it fits into a |
| 7 | short int, however here we are OR'ing VTE_SPAWN_* as well which have |
| 8 | higher values |
| 9 | |
| 10 | Fixes error like |
| 11 | src/vtepty.cc:577:16: error: integer value 234881535 is outside the valid range of values [0, 4095] for this enumeration type [-Wenum-constexpr-conversion] |
| 12 | |
| 13 | Fixes issue https://gitlab.gnome.org/GNOME/vte/-/issues/2618 |
| 14 | |
| 15 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/vte/-/issues/2618] |
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | --- |
| 18 | src/vtepty.cc | 24 ++++++++++++------------ |
| 19 | 1 file changed, 12 insertions(+), 12 deletions(-) |
| 20 | |
| 21 | diff --git a/src/vtepty.cc b/src/vtepty.cc |
| 22 | index 3aaa0d6b..2da2675f 100644 |
| 23 | --- a/src/vtepty.cc |
| 24 | +++ b/src/vtepty.cc |
| 25 | @@ -574,18 +574,18 @@ catch (...) |
| 26 | static constexpr inline auto |
| 27 | all_spawn_flags() noexcept |
| 28 | { |
| 29 | - return GSpawnFlags(G_SPAWN_LEAVE_DESCRIPTORS_OPEN | |
| 30 | - G_SPAWN_DO_NOT_REAP_CHILD | |
| 31 | - G_SPAWN_SEARCH_PATH | |
| 32 | - G_SPAWN_STDOUT_TO_DEV_NULL | |
| 33 | - G_SPAWN_STDERR_TO_DEV_NULL | |
| 34 | - G_SPAWN_CHILD_INHERITS_STDIN | |
| 35 | - G_SPAWN_FILE_AND_ARGV_ZERO | |
| 36 | - G_SPAWN_SEARCH_PATH_FROM_ENVP | |
| 37 | - G_SPAWN_CLOEXEC_PIPES | |
| 38 | - VTE_SPAWN_NO_PARENT_ENVV | |
| 39 | - VTE_SPAWN_NO_SYSTEMD_SCOPE | |
| 40 | - VTE_SPAWN_REQUIRE_SYSTEMD_SCOPE); |
| 41 | + return (G_SPAWN_LEAVE_DESCRIPTORS_OPEN | |
| 42 | + G_SPAWN_DO_NOT_REAP_CHILD | |
| 43 | + G_SPAWN_SEARCH_PATH | |
| 44 | + G_SPAWN_STDOUT_TO_DEV_NULL | |
| 45 | + G_SPAWN_STDERR_TO_DEV_NULL | |
| 46 | + G_SPAWN_CHILD_INHERITS_STDIN | |
| 47 | + G_SPAWN_FILE_AND_ARGV_ZERO | |
| 48 | + G_SPAWN_SEARCH_PATH_FROM_ENVP | |
| 49 | + G_SPAWN_CLOEXEC_PIPES | |
| 50 | + VTE_SPAWN_NO_PARENT_ENVV | |
| 51 | + VTE_SPAWN_NO_SYSTEMD_SCOPE | |
| 52 | + VTE_SPAWN_REQUIRE_SYSTEMD_SCOPE); |
| 53 | } |
| 54 | |
| 55 | static constexpr inline auto |
| 56 | -- |
| 57 | 2.39.2 |
| 58 | |