[gnome-terminal/gnome-3-36] screen: Don't dereference data unchecked

[Christian Persch <chpe src gnome org>]

commit bae3eab51ea5553150c3c3c28273495f0abb6f7d
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date:   Fri Mar 27 21:59:16 2020 +0000

    screen: Don't dereference data unchecked
    
    Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/issues/239
    (cherry picked from commit d02ae557b24dee36c91324be9f9a3f80c207e2a7)

 src/terminal-screen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index f1475c41..33fbb5df 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -828,7 +828,7 @@ terminal_screen_reexec_from_exec_data (TerminalScreen *screen,
                                envv ? envv : data ? data->envv : NULL,
                                data ? data->as_shell : TRUE,
                                /* If we have command line args, must always pass the cwd from the command 
line, too */
-                               data->argv ? data->cwd : cwd ? cwd : data ? data->cwd : NULL,
+                               data && data->argv ? data->cwd : cwd ? cwd : data ? data->cwd : NULL,
                                NULL /* fd list */, NULL /* fd array */,
                                NULL, NULL, NULL, /* callback + data + destroy notify */
                                cancellable,