From 70b1900dd13d16f2e83f571407a614541d5ac9ba Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 24 May 2007 20:58:25 +0000 Subject: [PATCH] 'mytx' in bug report #1723194 (http://curl.haxx.se/bug/view.cgi?id=1723194) pointed out that the warnf() function in the curl tool didn't properly deal with the cases when excessively long words were used in the string to chop up. --- CHANGES | 6 ++++++ src/main.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/CHANGES b/CHANGES index 258ab845d..60d388942 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,12 @@ \___|\___/|_| \_\_____| Changelog +Daniel S (24 May 2007) +- 'mytx' in bug report #1723194 (http://curl.haxx.se/bug/view.cgi?id=1723194) + pointed out that the warnf() function in the curl tool didn't properly deal + with the cases when excessively long words were used in the string to chop + up. + Daniel S (22 May 2007) - Andre Guibert de Bruet fixed a memory leak in the function that verifies the peer's name in the SSL certificate when built for OpenSSL. The leak happens diff --git a/src/main.c b/src/main.c index 8bed673cd..638c60a50 100644 --- a/src/main.c +++ b/src/main.c @@ -501,6 +501,10 @@ static void warnf(struct Configurable *config, const char *fmt, ...) while(!ISSPACE(ptr[cut]) && cut) { cut--; } + if(0 == cut) + /* not a single cutting position was found, just cut it at the + max text width then! */ + cut = WARN_TEXTWIDTH-1; fwrite(ptr, cut + 1, 1, config->errors); fputs("\n", config->errors);