Merge branch 'master' into wdk

This commit is contained in:
Berke Viktor
2012-03-16 00:08:01 +01:00
9 changed files with 99 additions and 13 deletions

View File

@@ -1159,6 +1159,8 @@ irc_inline (server *serv, char *buf, int len)
char pdibuf_static[522]; /* 1 line can potentially be 512*6 in utf8 */
char *pdibuf = pdibuf_static;
url_check_line (buf, len);
/* need more than 522? fall back to malloc */
if (len >= sizeof (pdibuf_static))
pdibuf = malloc (len + 1);