Re: Logic error in mandoc.c time2a()

Re: Logic error in mandoc.c time2a()

[Ingo Schwarze]

> 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

Re: Logic error in mandoc.c time2a()

[Kristaps Dzonsons]

> +	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);

Ingo,

I'm fine with the motion of this diff, but please thoroughly document 
the numbers in this before you commit.  Yes, they're clear upon 
inspection, but I want more in there than 10 + 4 + 4 + 1... But given 
this, ok kristaps.

Thanks!

Kristaps
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv