pidgin/pidgin

Merged in dequisdequis/security/release-2.x.y (pull request #20)
release-2.x.y
2018-03-07, Gary Kramlich
56c6d56d373f
Parents 5dbbf94443ee9f05d7f41a53
Children 233025cb30f5
Merged in dequisdequis/security/release-2.x.y (pull request #20)

purple_email_is_valid: fix out of bounds read (take 2)

Approved-by: Gary Kramlich
1 files changed, 1 insertions(+), 1 deletions(-)
  • +1 -1
    libpurple/util.c
    • --- a/libpurple/util.c Tue Mar 06 06:24:07 2018 +0000
    +++ b/libpurple/util.c Wed Mar 07 02:32:46 2018 +0000
    @@ -4403,7 +4403,7 @@
    if (*c == '\"' && (c == address || *(c - 1) == '.' || *(c - 1) == '\"')) {
    while (*++c) {
    if (*c == '\\') {
    - if (*c++ && *c < 127 && *c != '\n' && *c != '\r') continue;
    + if (*c++ && *c < 127 && *c > 0 && *c != '\n' && *c != '\r') continue;
    else return FALSE;
    }
    if (*c == '\"') break;