comparison src/core/ngx_string.h @ 7120:874171c3c71a

Fixed handling of non-null-terminated unix sockets. At least FreeBSD, macOS, NetBSD, and OpenBSD can return unix sockets with non-null-terminated sun_path. Additionally, the address may become non-null-terminated if it does not fit into the buffer provided and was truncated (may happen on macOS, NetBSD, and Solaris, which allow unix socket addresess larger than struct sockaddr_un). As such, ngx_sock_ntop() might overread the sockaddr provided, as it used "%s" format and thus assumed null-terminated string. To fix this, the ngx_strnlen() function was introduced, and it is now used to calculate correct length of sun_path.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 04 Oct 2017 21:19:38 +0300
parents 33c08d7e2915
children 9ca82f273967
comparison
equal deleted inserted replaced
7119:fef61d26da39 7120:874171c3c71a
57 #define ngx_strcmp(s1, s2) strcmp((const char *) s1, (const char *) s2) 57 #define ngx_strcmp(s1, s2) strcmp((const char *) s1, (const char *) s2)
58 58
59 59
60 #define ngx_strstr(s1, s2) strstr((const char *) s1, (const char *) s2) 60 #define ngx_strstr(s1, s2) strstr((const char *) s1, (const char *) s2)
61 #define ngx_strlen(s) strlen((const char *) s) 61 #define ngx_strlen(s) strlen((const char *) s)
62
63 size_t ngx_strnlen(u_char *p, size_t n);
62 64
63 #define ngx_strchr(s1, c) strchr((const char *) s1, (int) c) 65 #define ngx_strchr(s1, c) strchr((const char *) s1, (int) c)
64 66
65 static ngx_inline u_char * 67 static ngx_inline u_char *
66 ngx_strlchr(u_char *p, u_char *last, u_char c) 68 ngx_strlchr(u_char *p, u_char *last, u_char c)