X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9fcd66daf819294168e86ea5eb50c241b1d9fa11..28ef870c7a0936648cb0bc1ae721f2caa575391e:/src/tparam.c

diff --git a/src/tparam.c b/src/tparam.c
index 02047db209..d3ae4910b5 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -1,5 +1,5 @@
 /* Merge parameters into a termcap entry string.
-   Copyright (C) 1985, 1987, 1993, 1995, 2000-2008, 2013-2015 Free
+   Copyright (C) 1985, 1987, 1993, 1995, 2000-2008, 2013-2016 Free
    Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
@@ -167,9 +167,9 @@ tparam1 (const char *string, char *outstring, int len,
 			doup++, append_len_incr = strlen (up);
 		      else
 			doleft++, append_len_incr = strlen (left);
-		      if (INT_ADD_OVERFLOW (append_len, append_len_incr))
+		      if (INT_ADD_WRAPV (append_len_incr,
+					 append_len, &append_len))
 			memory_full (SIZE_MAX);
-		      append_len += append_len_incr;
 		    }
 		}
 	      *op++ = tem ? tem : 0200;