From 1a250d9f32361b30a8a632ecc0023680b1e38323 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 18 Jan 2007 08:41:22 +0000 Subject: - reinstate paranoia check in wrapf(). --- coreutils/stty.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/coreutils/stty.c b/coreutils/stty.c index 3ce8bf312..4e665bcb7 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c @@ -462,8 +462,9 @@ static void wrapf(const char *message, ...) va_start(args, message); buflen = vsnprintf(buf, sizeof(buf), message, args); va_end(args); - /* buflen = strlen(buf); cheaper not to pull in strlen */ - if (!buflen /*|| buflen >= sizeof(buf)*/) return; + /* We seem to be called only with suitable lengths, but check if + somebody failed to adhere to this assumption just to be sure. */ + if (!buflen || buflen >= sizeof(buf)) return; if (current_col > 0) { current_col++; -- cgit v1.2.3