summaryrefslogtreecommitdiff
path: root/src/collage.c
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@stoeckmann.org>2017-04-02 13:16:50 +0200
committerTobias Stoeckmann <tobias@stoeckmann.org>2017-04-02 13:16:50 +0200
commit575b9345c87f22349c948fcc814c301816315a71 (patch)
treee67c6d741c3d1d6715812701965cf55944e2d236 /src/collage.c
parenta5e60401f9dce39f7f1bcf53ede508c63f5d2ad3 (diff)
Always terminate strncpy results with '\0'.
The strncpy function does not guarantee to end the resulting character sequence with a terminating nul character if not enough space is available. This could be triggered by supplying a sufficiently long output_file option. Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Diffstat (limited to 'src/collage.c')
-rw-r--r--src/collage.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/collage.c b/src/collage.c
index bcb30fa..b975136 100644
--- a/src/collage.c
+++ b/src/collage.c
@@ -191,8 +191,10 @@ void init_collage_mode(void)
char output_buf[1024];
if (opt.output_dir)
snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file);
- else
- strncpy(output_buf, opt.output_file, 1024);
+ else {
+ strncpy(output_buf, opt.output_file, 1023);
+ output_buf[1023] = '\0';
+ }
gib_imlib_save_image(im_main, output_buf);
if (opt.verbose) {
int tw, th;