grim/guifications2

Fix a crash when purple_notify_emails(count = 0) is called
org.guifications.gf2
2009-05-10, Paul Aurich
822acffedf8d
Parents 482d7319717d
Children 7b2dc82c0af5
Fix a crash when purple_notify_emails(count = 0) is called

#4 gf_event_emails (gc=0x307d110, count=0, detailed=0, subject=0x0, from=0x0,
to=0x0, url=0x0) at gf_event.c:625
#5 0x00007ff8db9c9373 in purple_notify_emails (handle=0x307d110, count=0,
detailed=0, subjects=0x0, froms=0x0, tos=0x0, urls=0x0, cb=0,
user_data=0x0) at notify.c:158
2 files changed, 7 insertions(+), 2 deletions(-)
  • +4 -1
    mkinstalldirs
  • +3 -1
    src/gf_event.c
    • --- a/mkinstalldirs Sat Apr 25 23:55:42 2009 -0400
    +++ b/mkinstalldirs Sun May 10 19:10:31 2009 -0700
    @@ -1,7 +1,7 @@
    #! /bin/sh
    # mkinstalldirs --- make directory hierarchy
    -scriptversion=2005-06-29.22
    +scriptversion=2006-05-11.19
    # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
    # Created: 1993-05-16
    @@ -11,6 +11,9 @@
    # bugs to <bug-automake@gnu.org> or send patches to
    # <automake-patches@gnu.org>.
    +nl='
    +'
    +IFS=" "" $nl"
    errstatus=0
    dirmode=
    --- a/src/gf_event.c Sat Apr 25 23:55:42 2009 -0400
    +++ b/src/gf_event.c Sun May 10 19:10:31 2009 -0700
    @@ -615,7 +615,9 @@
    const char **subject, const char **from,
    const char **to, const char **url)
    {
    - if(count == 1) {
    + if(count == 0) {
    + return NULL;
    + } else if(count == 1) {
    if(subject && *subject) {
    return gf_event_email(gc, *subject, *from, *to, *url);
    }