Module Name: src
Committed By: christos
Date: Sat Jun 16 00:40:14 UTC 2018
Modified Files:
src/usr.bin/patch: inp.c
Log Message:
PR/53368: Thomas Barabosch: Potential integer overflow in usr.bin/patch/inp.c
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/patch/inp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/patch/inp.c
diff -u src/usr.bin/patch/inp.c:1.24 src/usr.bin/patch/inp.c:1.25
--- src/usr.bin/patch/inp.c:1.24 Fri Jul 24 14:56:00 2015
+++ src/usr.bin/patch/inp.c Fri Jun 15 20:40:14 2018
@@ -1,7 +1,7 @@
/*
* $OpenBSD: inp.c,v 1.34 2006/03/11 19:41:30 otto Exp $
* $DragonFly: src/usr.bin/patch/inp.c,v 1.6 2007/09/29 23:11:10 swildner Exp $
- * $NetBSD: inp.c,v 1.24 2015/07/24 18:56:00 christos Exp $
+ * $NetBSD: inp.c,v 1.25 2018/06/16 00:40:14 christos Exp $
*/
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: inp.c,v 1.24 2015/07/24 18:56:00 christos Exp $");
+__RCSID("$NetBSD: inp.c,v 1.25 2018/06/16 00:40:14 christos Exp $");
#include <sys/types.h>
#include <sys/file.h>
@@ -118,12 +118,11 @@ scan_input(const char *filename)
static bool
reallocate_lines(size_t *lines_allocated)
{
- char **p;
size_t new_size;
new_size = *lines_allocated * 3 / 2;
- p = realloc(i_ptr, (new_size + 2) * sizeof(char *));
- if (p == NULL) { /* shucks, it was a near thing */
+ int res = reallocarr(&i_ptr, new_size + 2, sizeof(char *));
+ if (res != 0) { /* shucks, it was a near thing */
munmap(i_womp, i_size);
i_womp = NULL;
free(i_ptr);
@@ -132,7 +131,6 @@ reallocate_lines(size_t *lines_allocated
return false;
}
*lines_allocated = new_size;
- i_ptr = p;
return true;
}
