projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disallow creation of objects larger than PTRDIFF_MAX via mmap
[musl]
/
src
/
string
/
strerror_r.c
diff --git
a/src/string/strerror_r.c
b/src/string/strerror_r.c
index
6fdd4ce
..
da26b4f
100644
(file)
--- a/
src/string/strerror_r.c
+++ b/
src/string/strerror_r.c
@@
-1,11
+1,20
@@
#include <string.h>
#include <errno.h>
#include <string.h>
#include <errno.h>
+#include "libc.h"
int strerror_r(int err, char *buf, size_t buflen)
{
char *msg = strerror(err);
int strerror_r(int err, char *buf, size_t buflen)
{
char *msg = strerror(err);
- if (strlen(msg) >= buflen)
+ size_t l = strlen(msg);
+ if (l >= buflen) {
+ if (buflen) {
+ memcpy(buf, msg, buflen-1);
+ buf[buflen-1] = 0;
+ }
return ERANGE;
return ERANGE;
- strcpy(buf, msg);
+ }
+ memcpy(buf, msg, l+1);
return 0;
}
return 0;
}
+
+weak_alias(strerror_r, __xpg_strerror_r);