better diff from openpkg

This commit is contained in:
brad 2004-07-06 22:06:17 +00:00
parent a635e37a48
commit 59d16f1db0

View File

@ -1,20 +1,19 @@
$OpenBSD: patch-pngerror_c,v 1.1 2004/05/03 05:13:04 robert Exp $
--- pngerror.c.orig Sun May 2 22:47:58 2004
+++ pngerror.c Sun May 2 22:49:36 2004
@@ -135,10 +135,14 @@
$OpenBSD: patch-pngerror_c,v 1.2 2004/07/06 22:06:17 brad Exp $
--- pngerror.c.orig Thu Oct 3 07:32:27 2002
+++ pngerror.c Tue Jul 6 17:36:30 2004
@@ -135,10 +135,13 @@ png_format_buffer(png_structp png_ptr, p
buffer[iout] = 0;
else
{
+ int len = strlen(error_message);
+
+ if (len > 64)
+ len = 64;
+ png_size_t len;
+ if ((len = png_strlen(error_message)) > 63)
+ len = 63;
buffer[iout++] = ':';
buffer[iout++] = ' ';
- png_memcpy(buffer+iout, error_message, 64);
- buffer[iout+63] = 0;
+ png_memcpy(buffer+iout, error_message, len);
+ buffer[iout+len-1] = 0;
+ buffer[iout+len] = 0;
}
}