Commit b6bc4ef7 authored by derf's avatar derf Committed by GitHub
Browse files

Merge pull request #288 from stoeckmann/strncpy 

Always terminate strncpy results with '\0'.
parents 78a840ed 575b9345

src/collage.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

src/index.c

+4 −2
Original line number Diff line number Diff line
@@ -324,8 +324,10 @@ void init_index_mode(void) 


		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_with_error_return(im_main, output_buf, &err);

		if (err) {

src/thumbnail.c

+4 −2
Original line number Diff line number Diff line
@@ -381,8 +381,10 @@ void init_thumbnail_mode(void) 


		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_with_error_return(td.im_main, output_buf, &err);

		if (err) {

			feh_imlib_print_load_error(output_buf, td.im_main, err);