From: Ingo Schwarze <schwarze@usta.de>
To: uqs@spoerlein.net
Cc: tech@mdocml.bsd.lv
Subject: Re: Logic error in mandoc.c time2a()
Date: Sat, 12 Mar 2011 02:59:14 +0100 [thread overview]
Message-ID: <20110312015914.GB12289@iris.usta.de> (raw)
In-Reply-To: <20110312002738.GA12289@iris.usta.de>
> I need to cook a diff...
Index: mandoc.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/mandoc.c,v
retrieving revision 1.22
diff -u -p -r1.22 mandoc.c
--- mandoc.c 7 Mar 2011 01:35:33 -0000 1.22
+++ mandoc.c 12 Mar 2011 01:56:00 -0000
@@ -382,29 +382,29 @@ static char *
time2a(time_t t)
{
struct tm tm;
- char buf[DATESIZE];
- char *p;
- size_t nsz, rsz;
+ char *buf, *p;
+ size_t ssz;
int isz;
localtime_r(&t, &tm);
- p = buf;
- rsz = DATESIZE;
+ p = buf = mandoc_malloc(10 + 4 + 4 + 1);
- if (0 == (nsz = strftime(p, rsz, "%B ", &tm)))
- return(NULL);
-
- p += (int)nsz;
- rsz -= nsz;
-
- if (-1 == (isz = snprintf(p, rsz, "%d, ", tm.tm_mday)))
- return(NULL);
+ if (0 == (ssz = strftime(p, 10 + 1, "%B ", &tm)))
+ goto fail;
+ p += (int)ssz;
+ if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm.tm_mday)))
+ goto fail;
p += isz;
- rsz -= isz;
- return(strftime(p, rsz, "%Y", &tm) ? buf : NULL);
+ if (0 == strftime(p, 4 + 1, "%Y", &tm))
+ goto fail;
+ return(buf);
+
+fail:
+ free(buf);
+ return(NULL);
}
@@ -426,7 +426,7 @@ mandoc_normdate(char *in, mandocmsg msg,
t = 0;
}
out = t ? time2a(t) : NULL;
- return(mandoc_strdup(out ? out : in));
+ return(out ? out : mandoc_strdup(in));
}
--
To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv
next parent reply other threads:[~2011-03-12 1:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110311204204.GA85668@acme.spoerlein.net>
[not found] ` <20110312002738.GA12289@iris.usta.de>
2011-03-12 1:59 ` Ingo Schwarze [this message]
2011-03-14 17:06 ` Kristaps Dzonsons
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=20110312015914.GB12289@iris.usta.de \
--to=schwarze@usta.de \
--cc=tech@mdocml.bsd.lv \
--cc=uqs@spoerlein.net \
/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).