From abef21776d6b2ffa48e29fc4eaa27a38eaa40676 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 11 Sep 2017 09:23:17 +0100 Subject: [PATCH] gtkmountoperation-x11: Do array length check before dereference Signed-off-by: Philip Withnall https://bugzilla.gnome.org/show_bug.cgi?id=787302 --- gtk/gtkmountoperation-x11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkmountoperation-x11.c b/gtk/gtkmountoperation-x11.c index 10c7bbcf81..adb47b1659 100644 --- a/gtk/gtkmountoperation-x11.c +++ b/gtk/gtkmountoperation-x11.c @@ -653,7 +653,7 @@ pid_get_env (GPid pid, n = 0; while (TRUE) { - if (env[n] == '\0' || n >= env_len) + if (n >= env_len || env[n] == '\0') break; if (g_str_has_prefix (env + n, key) && (*(env + n + key_len) == '=')) @@ -666,7 +666,7 @@ pid_get_env (GPid pid, break; } - for (; env[n] != '\0' && n < env_len; n++) + for (; n < env_len && env[n] != '\0'; n++) ; n++; } -- 2.30.2