=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/diff3.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- src/usr.bin/rcs/diff3.c 2012/03/04 04:05:15 1.33 +++ src/usr.bin/rcs/diff3.c 2014/12/01 21:58:46 1.34 @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.33 2012/03/04 04:05:15 fgsch Exp $ */ +/* $OpenBSD: diff3.c,v 1.34 2014/12/01 21:58:46 deraadt Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -637,7 +637,7 @@ do { bufsize += 1024; } while (len + 1 > bufsize); - buf = xrealloc(buf, 1, bufsize); + buf = xreallocarray(buf, 1, bufsize); } memcpy(buf, cp, len - 1); buf[len - 1] = '\n'; @@ -934,13 +934,13 @@ newsz = szchanges == 0 ? 64 : 2 * szchanges; incr = newsz - szchanges; - d13 = xrealloc(d13, newsz, sizeof(*d13)); + d13 = xreallocarray(d13, newsz, sizeof(*d13)); memset(d13 + szchanges, 0, incr * sizeof(*d13)); - d23 = xrealloc(d23, newsz, sizeof(*d23)); + d23 = xreallocarray(d23, newsz, sizeof(*d23)); memset(d23 + szchanges, 0, incr * sizeof(*d23)); - de = xrealloc(de, newsz, sizeof(*de)); + de = xreallocarray(de, newsz, sizeof(*de)); memset(de + szchanges, 0, incr * sizeof(*de)); - overlap = xrealloc(overlap, newsz, sizeof(*overlap)); + overlap = xreallocarray(overlap, newsz, sizeof(*overlap)); memset(overlap + szchanges, 0, incr * sizeof(*overlap)); szchanges = newsz; }