generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Maciej Karpiuk fixed a crash that would occur if we passed Curl_strerror()

Browse Source 
an unknown error number on glibc systems.
http://curl.haxx.se/bug/view.cgi?id=1532289
This commit is contained in:
Daniel Stenberg
2006-08-01 09:39:01 +00:00
parent 9f579f12fc
commit ee642859ef
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/strerror.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 2004, 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 2004 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -637,8 +637,11 @@ const char *Curl_strerror(struct connectdata *conn, int err)
char *msg = strerror_r(err, buffer, sizeof(buffer));
/* this version of strerror_r() only *might* use the buffer we pass to
the function, but it always returns the error message as a pointer,
so we must copy that string unconditionally */
strncpy(buf, msg, max);
so we must copy that string unconditionally (if non-NULL) */
if(msg)
strncpy(buf, msg, max);
else
snprintf(buf, max, "Unknown error %d", err);
}
#endif /* end of HAVE_GLIBC_STRERROR_R */
#else /* HAVE_STRERROR_R */