From: Philip Withnall <withnall@endlessm.com>
Date: Mon, 11 Sep 2017 08:23:17 +0000 (+0100)
Subject: gtkmountoperation-x11: Do array length check before dereference
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~181
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=abef21776d6b2ffa48e29fc4eaa27a38eaa40676;p=gtk%2B3.0.git

gtkmountoperation-x11: Do array length check before dereference

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=787302
---

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++;
         }