Commit 33930d82ce80dd4cd2c20e732940d4c88e411a98 - nginx

ngx_strerror_r() style and size == 0 bug fix Igor Sysoev 13 years ago

2 changed file(s) with 8 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all

-4

src/os/unix/ngx_errno.c less more

9	9
10	10	#if (NGX_HAVE_STRERROR_R)
11	11
12		u_char ngx_strerror_r(int err, u_char errstr, size_t size)
	12	u_char *
	13	ngx_strerror_r(int err, u_char *errstr, size_t size)
13	14	{
14	15	if (size == 0) {
15		return 0;
	16	return errstr;
16	17	}
17	18
18	19	errstr[0] = '\0';

31	32
32	33	/* Linux strerror_r() */
33	34
34		u_char ngx_strerror_r(int err, u_char errstr, size_t size)
	35	u_char *
	36	ngx_strerror_r(int err, u_char *errstr, size_t size)
35	37	{
36	38	char *str;
37	39
38	40	if (size == 0) {
39		return 0;
	41	return errstr;
40	42	}
41	43
42	44	errstr[0] = '\0';

-1

src/os/win32/ngx_errno.c less more

90	90	};
91	91
92	92
93		u_char ngx_strerror_r(ngx_err_t err, u_char errstr, size_t size)
	93	u_char *
	94	ngx_strerror_r(ngx_err_t err, u_char *errstr, size_t size)
94	95	{
95	96	int n;
96	97	u_int len;