浏览代码

make strerror_r behave nicer on failure

if the buffer is too short, at least return a partial string. this is
helpful if the caller is lazy and does not check for failure. care is
taken to avoid writing anything if the buffer length is zero, and to
always null-terminate when the buffer length is non-zero.
Rich Felker 12 年之前
父节点
当前提交
f313a16224
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      src/string/strerror_r.c

+ 8 - 2
src/string/strerror_r.c

@@ -4,8 +4,14 @@
 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;
-	strcpy(buf, msg);
+	}
+	memcpy(buf, msg, l+1);
 	return 0;
 }