qulogic/pidgin

Merged in slingamn/pidgin_main/bug_12562 (pull request #272)
release-2.x.y
2017-11-17, Gary Kramlich
7c9350e3089e
Parents 9532eddd21ca37192dfc65d7
Children 02446e7b812b
Merged in slingamn/pidgin_main/bug_12562 (pull request #272)

fixes to IRC buffer handling, replaces #256

Approved-by: Eion Robb
Approved-by: Gary Kramlich
Approved-by: Ethan Blanton
2 files changed, 31 insertions(+), 17 deletions(-)
  • +29 -16
    libpurple/protocols/irc/irc.c
  • +2 -1
    libpurple/protocols/irc/irc.h
    • --- a/libpurple/protocols/irc/irc.c Thu Nov 16 20:37:08 2017 -0600
    +++ b/libpurple/protocols/irc/irc.c Fri Nov 17 03:03:28 2017 +0000
    @@ -685,31 +685,38 @@
    return;
    }
    - if (irc->inbuflen < irc->inbufused + IRC_INITIAL_BUFSIZE) {
    - irc->inbuflen += IRC_INITIAL_BUFSIZE;
    - irc->inbuf = g_realloc(irc->inbuf, irc->inbuflen);
    - }
    + do {
    + // resize buffer upwards so we have at least IRC_BUFSIZE_INCREMENT
    + // bytes free in inbuf
    + if (irc->inbuflen < irc->inbufused + IRC_BUFSIZE_INCREMENT) {
    + if (irc->inbuflen + IRC_BUFSIZE_INCREMENT <= IRC_MAX_BUFSIZE) {
    + irc->inbuflen += IRC_BUFSIZE_INCREMENT;
    + irc->inbuf = g_realloc(irc->inbuf, irc->inbuflen);
    + } else {
    + // discard unparseable data from the buffer
    + irc->inbufused = 0;
    + }
    + }
    - len = purple_ssl_read(gsc, irc->inbuf + irc->inbufused, IRC_INITIAL_BUFSIZE - 1);
    + len = purple_ssl_read(gsc, irc->inbuf + irc->inbufused, irc->inbuflen - irc->inbufused - 1);
    + if (len > 0) {
    + read_input(irc, len);
    + }
    + } while (len > 0);
    - if (len < 0 && errno == EAGAIN) {
    - /* Try again later */
    - return;
    - } else if (len < 0) {
    + if (len < 0 && errno != EAGAIN) {
    gchar *tmp = g_strdup_printf(_("Lost connection with server: %s"),
    g_strerror(errno));
    purple_connection_error_reason (gc,
    PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
    g_free(tmp);
    - return;
    } else if (len == 0) {
    purple_connection_error_reason (gc,
    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
    _("Server closed the connection"));
    - return;
    }
    - read_input(irc, len);
    + /* else: len < 0 && errno == EAGAIN; this is fine, try again later */
    }
    static void irc_input_cb(gpointer data, gint source, PurpleInputCondition cond)
    @@ -718,12 +725,18 @@
    struct irc_conn *irc = gc->proto_data;
    int len;
    - if (irc->inbuflen < irc->inbufused + IRC_INITIAL_BUFSIZE) {
    - irc->inbuflen += IRC_INITIAL_BUFSIZE;
    - irc->inbuf = g_realloc(irc->inbuf, irc->inbuflen);
    + /* see irc_input_cb_ssl */
    + if (irc->inbuflen < irc->inbufused + IRC_BUFSIZE_INCREMENT) {
    + if (irc->inbuflen + IRC_BUFSIZE_INCREMENT <= IRC_MAX_BUFSIZE) {
    + irc->inbuflen += IRC_BUFSIZE_INCREMENT;
    + irc->inbuf = g_realloc(irc->inbuf, irc->inbuflen);
    + } else {
    + irc->inbufused = 0;
    + }
    }
    - len = read(irc->fd, irc->inbuf + irc->inbufused, IRC_INITIAL_BUFSIZE - 1);
    + len = read(irc->fd, irc->inbuf + irc->inbufused, irc->inbuflen - irc->inbufused - 1);
    +
    if (len < 0 && errno == EAGAIN) {
    return;
    } else if (len < 0) {
    --- a/libpurple/protocols/irc/irc.h Thu Nov 16 20:37:08 2017 -0600
    +++ b/libpurple/protocols/irc/irc.h Fri Nov 17 03:03:28 2017 +0000
    @@ -44,7 +44,8 @@
    #define IRC_DEFAULT_QUIT "Leaving."
    -#define IRC_INITIAL_BUFSIZE 1024
    +#define IRC_BUFSIZE_INCREMENT 1024
    +#define IRC_MAX_BUFSIZE 16384
    #define IRC_MAX_MSG_SIZE 512