diff options
author | Till Kamppeter <till.kamppeter@gmail.com> | 2012-07-02 17:14:00 +0200 |
---|---|---|
committer | Till Kamppeter <till.kamppeter@gmail.com> | 2012-07-02 17:14:00 +0200 |
commit | e66690ff88df2392e4ea508529aa065ee75ed57a (patch) | |
tree | 6f71a5a8f53f4f860bb57cfac291c3ee5e74decf /renderer.c | |
parent | 636ded7690496b03ba82d43473666d7fb3358a8f (diff) | |
parent | 112cca846d8b08d08e13afce71cb0443d3ec60f5 (diff) |
Merge tag 'upstream/4.0.17'
Upstream version 4.0.17
Diffstat (limited to 'renderer.c')
-rw-r--r-- | renderer.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -319,6 +319,8 @@ static int write_merged_jcl_options(FILE *stream, fprintf(stream, "%s\n", *optsp2); } if (optsp1 != original_opts) p = *optsp1; + if (!p) + _log("write_merged_jcl_options() dereferences NULL pointer p\n"); if (jcl_options_find_keyword(opts, p, jclstr)) fprintf(stream, "%s\n", jcl_options_find_keyword(opts, p, jclstr)); else @@ -413,23 +415,28 @@ int exec_kid3(FILE *in, FILE *out, void *user_arg) dstrcpy(commandline, (const char *)user_arg); kid4 = start_process("kid4", exec_kid4, NULL, &kid4in, NULL); - if (kid4 < 0) + if (kid4 < 0) { + free_dstr(commandline); return EXIT_PRNERR_NORETRY_BAD_SETTINGS; + } if (in && dup2(fileno(in), fileno(stdin)) < 0) { _log("kid3: Could not dup stdin\n"); fclose(kid4in); + free_dstr(commandline); return EXIT_PRNERR_NORETRY_BAD_SETTINGS; } if (dup2(fileno(kid4in), fileno(stdout)) < 0) { _log("kid3: Could not dup stdout to kid4\n"); fclose(kid4in); + free_dstr(commandline); return EXIT_PRNERR_NORETRY_BAD_SETTINGS; } if (debug) { if (!redirect_log_to_stderr()) { fclose(kid4in); + free_dstr(commandline); return EXIT_PRNERR_NORETRY_BAD_SETTINGS; } |