diff options
| author |  Fred-Barclay <Fred-Barclay@users.noreply.github.com> | 2018-07-21 22:42:30 -0500 |
|---|---|---|
| committer | Fred-Barclay <Fred-Barclay@users.noreply.github.com> | 2018-07-21 22:42:30 -0500 |
| commit | 95b57af6f23cd73cc090530bc818dda48e2d5cb3 (patch) | |
| tree | 28e3e9ecb477c097e36fae7360e673420f68c91d | |
| parent | Consistent home variable -- see eb4b505ac2537c320c044cf5fad595ecef41bbca (diff) | |
| parent | Fixes #1404 (diff) | |
| download | firejail-95b57af6f23cd73cc090530bc818dda48e2d5cb3.tar.gz firejail-95b57af6f23cd73cc090530bc818dda48e2d5cb3.tar.zst firejail-95b57af6f23cd73cc090530bc818dda48e2d5cb3.zip | |
Merge branch 'master' of https://github.com/netblue30/firejail
| -rw-r--r-- | src/firejail/x11.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c index df6092dff..9cbe6598e 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c | |||
| @@ -950,6 +950,8 @@ void x11_start_xpra_new(int argc, char **argv, char *display_str) { | |||
| 950 | } | 950 | } |
| 951 | } | 951 | } |
| 952 | 952 | ||
| 953 | server_argv[spos++] = NULL; | ||
| 954 | |||
| 953 | assert((int) fpos < (argc+2)); | 955 | assert((int) fpos < (argc+2)); |
| 954 | assert(!firejail_argv[fpos]); | 956 | assert(!firejail_argv[fpos]); |
| 955 | // no overrun | 957 | // no overrun |