diff --git a/src/header/string/mod.rs b/src/header/string/mod.rs index 8c8acb21613e0e96100d54b76344fd906a685c25..c402707f360a034c4756e688a2fb7919f72c3187 100644 --- a/src/header/string/mod.rs +++ b/src/header/string/mod.rs @@ -235,8 +235,10 @@ pub unsafe extern "C" fn strerror_r(errnum: c_int, buf: *mut c_char, buflen: siz let len = strlen(msg); if len >= buflen { - memcpy(buf as *mut c_void, msg as *const c_void, buflen - 1); - *buf.add(buflen - 1) = 0; + if buflen != 0 { + memcpy(buf as *mut c_void, msg as *const c_void, buflen - 1); + *buf.add(buflen - 1) = 0; + } return ERANGE as c_int; } memcpy(buf as *mut c_void, msg as *const c_void, len + 1); diff --git a/tests/error.c b/tests/error.c index bb613b92239e30170482fde52dda1de9385f2f75..5cbe10385dd4ca3c03c89da32f9e5e412ca93607 100644 --- a/tests/error.c +++ b/tests/error.c @@ -19,4 +19,8 @@ int main(void) { char buf2[3]; int ret2 = strerror_r(err, buf2, 3); printf("errno: %d = %s, return: %d\n", err, buf2, ret2); + + char buf3[256]; + int ret3 = strerror_r(err, buf3, 0); + printf("errno: %d = %s, return: %d\n", err, buf3, ret3); } diff --git a/tests/expected/error.stdout b/tests/expected/error.stdout index d1c1a211ff8f941db9dde9b85a068b78fa665341..4e744d1bfbee3507caf31c2fdd26aef8d605e865 100644 --- a/tests/expected/error.stdout +++ b/tests/expected/error.stdout @@ -1,3 +1,4 @@ errno: 2 = No such file or directory errno: 2 = No such file or directory, return: 0 errno: 2 = No, return: 34 +errno: 2 = , return: 34