From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: If no output device was allocated because no file wanted to
Date: Thu, 22 Oct 2015 16:04:13 -0500 (EST) [thread overview]
Message-ID: <8668592806535262168.enqueue@fantadrom.bsd.lv> (raw)
Log Message:
-----------
If no output device was allocated because no file wanted to produce output,
refrain from dereferencing a NULL pointer during final deallocation.
Fixing a recent regression reported by czarkoff@
Modified Files:
--------------
mdocml:
main.c
Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -Lmain.c -Lmain.c -u -p -r1.251 -r1.252
--- main.c
+++ main.c
@@ -466,21 +466,23 @@ main(int argc, char *argv[])
mparse_reset(curp.mp);
}
- switch (curp.outtype) {
- case OUTT_HTML:
- html_free(curp.outdata);
- break;
- case OUTT_UTF8:
- case OUTT_LOCALE:
- case OUTT_ASCII:
- ascii_free(curp.outdata);
- break;
- case OUTT_PDF:
- case OUTT_PS:
- pspdf_free(curp.outdata);
- break;
- default:
- break;
+ if (curp.outdata != NULL) {
+ switch (curp.outtype) {
+ case OUTT_HTML:
+ html_free(curp.outdata);
+ break;
+ case OUTT_UTF8:
+ case OUTT_LOCALE:
+ case OUTT_ASCII:
+ ascii_free(curp.outdata);
+ break;
+ case OUTT_PDF:
+ case OUTT_PS:
+ pspdf_free(curp.outdata);
+ break;
+ default:
+ break;
+ }
}
mparse_free(curp.mp);
mchars_free();
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2015-10-22 21:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8668592806535262168.enqueue@fantadrom.bsd.lv \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).