GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

r15171@tombo: nickm | 2007-12-06 12:47:47 -0500

Browse Source 
Use GCC attributes (where available) to verify printf type-correctness.  Fix some bugs this turned up.


svn:r573
This commit is contained in:
Nick Mathewson 2007-12-06 18:12:56 +00:00
parent 1e435af17e
commit 3206bbca46
6 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18,6 +18,8 @@ Changes in current version:
o small improvements to evhttp documentation
o always generate Date and Content-Length headers for HTTP/1.1 replies
o set the correct event base for HTTP close events
o When building with GCC, use the "format" attribute to verify type correctness of calls to printf-like functions.
Changes in 1.4.0:
o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.

2
event.c
View File

@ -173,7 +173,7 @@ event_base_new(void)
struct event_base *base;
if ((base = event_calloc(1, sizeof(struct event_base))) == NULL)
event_err(1, "%s: calloc");
event_err(1, "%s: calloc", __func__);
event_sigcb = NULL;
event_gotsig = 0;

6
event.h
View File

@ -1015,7 +1015,11 @@ int evbuffer_add_buffer(struct evbuffer *, struct evbuffer *);
@param ... arguments that will be passed to printf(3)
@return 0 if successful, or -1 if an error occurred
*/
int evbuffer_add_printf(struct evbuffer *, const char *fmt, ...);
int evbuffer_add_printf(struct evbuffer *, const char *fmt, ...)
#ifdef __GNUC__
__attribute__((format(printf, 2, 3)))
#endif
;
/**

35
http.c
View File

@ -1649,12 +1649,12 @@ evhttp_send_done(struct evhttp_connection *evcon, void *arg)
void
evhttp_send_error(struct evhttp_request *req, int error, const char *reason)
{
const char *fmt = "<HTML><HEAD>\n"
"<TITLE>%d %s</TITLE>\n"
"</HEAD><BODY>\n"
"<H1>Method Not Implemented</H1>\n"
"Invalid method in request<P>\n"
"</BODY></HTML>\n";
#define ERR_FORMAT "<HTML><HEAD>\n" \
"<TITLE>%d %s</TITLE>\n" \
"</HEAD><BODY>\n" \
"<H1>Method Not Implemented</H1>\n" \
"Invalid method in request<P>\n" \
"</BODY></HTML>\n"
struct evbuffer *buf = evbuffer_new();
@ -1663,11 +1663,12 @@ evhttp_send_error(struct evhttp_request *req, int error, const char *reason)
evhttp_response_code(req, error, reason);
evbuffer_add_printf(buf, fmt, error, reason);
evbuffer_add_printf(buf, ERR_FORMAT, error, reason);
evhttp_send_page(req, buf);
evbuffer_free(buf);
#undef ERR_FORMAT
}
/* Requires that headers and response code are already set up */
@ -1722,7 +1723,7 @@ evhttp_send_reply_chunk(struct evhttp_request *req, struct evbuffer *databuf)
{
if (req->chunked) {
evbuffer_add_printf(req->evcon->output_buffer, "%x\r\n",
EVBUFFER_LENGTH(databuf));
(unsigned)EVBUFFER_LENGTH(databuf));
}
evbuffer_add_buffer(req->evcon->output_buffer, databuf);
evhttp_write_buffer(req->evcon, NULL, NULL);
@ -1829,7 +1830,8 @@ evhttp_decode_uri(const char *uri)
ret = event_malloc(strlen(uri) + 1);
if (ret == NULL)
event_err(1, "%s: malloc(%d)", __func__, strlen(uri) + 1);
event_err(1, "%s: malloc(%lu)", __func__,
(unsigned long)(strlen(uri) + 1));
for (i = j = 0; uri[i] != '\0'; i++) {
c = uri[i];
@ -1947,25 +1949,26 @@ evhttp_handle_request(struct evhttp_request *req, void *arg)
return;
} else {
/* We need to send a 404 here */
const char *fmt = "<html><head>"
"<title>404 Not Found</title>"
"</head><body>"
"<h1>Not Found</h1>"
"<p>The requested URL %s was not found on this server.</p>"
"</body></html>\n";
#define ERR_FORMAT "<html><head>" \
"<title>404 Not Found</title>" \
"</head><body>" \
"<h1>Not Found</h1>" \
"<p>The requested URL %s was not found on this server.</p>"\
"</body></html>\n"
char *escaped_html = evhttp_htmlescape(req->uri);
struct evbuffer *buf = evbuffer_new();
evhttp_response_code(req, HTTP_NOTFOUND, "Not Found");
evbuffer_add_printf(buf, fmt, escaped_html);
evbuffer_add_printf(buf, ERR_FORMAT, escaped_html);
event_free(escaped_html);
evhttp_send_page(req, buf);
evbuffer_free(buf);
#undef ERR_FORMAT
}
}

20
log.h
View File

@ -27,12 +27,18 @@
#ifndef _LOG_H_
#define _LOG_H_
void event_err(int eval, const char *fmt, ...);
void event_warn(const char *fmt, ...);
void event_errx(int eval, const char *fmt, ...);
void event_warnx(const char *fmt, ...);
void event_msgx(const char *fmt, ...);
void _event_debugx(const char *fmt, ...);
#ifdef __GNUC__
#define EV_CHECK_FMT(a,b) __attribute__((format(printf, a, b)))
#else
#define EV_CHECK_FMT(a,b)
#endif
void event_err(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3);
void event_warn(const char *fmt, ...) EV_CHECK_FMT(1,2);
void event_errx(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3);
void event_warnx(const char *fmt, ...) EV_CHECK_FMT(1,2);
void event_msgx(const char *fmt, ...) EV_CHECK_FMT(1,2);
void _event_debugx(const char *fmt, ...) EV_CHECK_FMT(1,2);
#ifdef USE_DEBUG
#define event_debug(x) _event_debugx x
@ -40,4 +46,6 @@ void _event_debugx(const char *fmt, ...);
#define event_debug(x) do {;} while (0)
#endif
#undef EV_CHECK_FMT
#endif

2
signal.c
View File

@ -252,7 +252,7 @@ evsignal_handler(int sig)
if(evsignal_base == NULL) {
event_warn(
"%s: received signal %s, but have no base configured",
"%s: received signal %d, but have no base configured",
__func__, sig);
return;
}