diff options
| author | Christian Hammond <chipx86@chipx86.com> | 2005-08-10 08:38:13 +0000 |
|---|---|---|
| committer | Christian Hammond <chipx86@chipx86.com> | 2005-08-10 08:38:13 +0000 |
| commit | 1536cf6201b87bf9fb6d0a66e29f829980f08b52 (patch) | |
| tree | ba53114d6f9472a31a60ab3b57fdbc6d915bbe41 | |
| parent | 341489c738e2273591ec7e01b7b9140fc30f992d (diff) | |
| download | libnotify-1536cf6201b87bf9fb6d0a66e29f829980f08b52.tar.gz | |
Hopefully properly grab hint values from the D-BUS message iter in a way that will work on AMD64 and PPC.
| -rw-r--r-- | libnotify/notify.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libnotify/notify.c b/libnotify/notify.c index cbd85f1..3eb4682 100644 --- a/libnotify/notify.c +++ b/libnotify/notify.c @@ -39,6 +39,7 @@ #include <stdlib.h> #include <stdarg.h> #include <unistd.h> +#include <limits.h> #define NOTIFY_DBUS_SERVICE "org.freedesktop.Notifications" #define NOTIFY_DBUS_CORE_INTERFACE "org.freedesktop.Notifications" @@ -59,7 +60,7 @@ struct _NotifyHandle struct _NotifyIcon { - int frames; + size_t frames; char **uri; @@ -741,6 +742,9 @@ notify_icon_add_frame_from_data(NotifyIcon *icon, size_t icon_len, const guchar g_return_val_if_fail(icon_data != NULL, FALSE); g_return_val_if_fail(icon_len != 0, FALSE); + /* check for integer overflow */ + g_return_val_if_fail(icon->frames + 1 < INT_MAX, FALSE); + if (icon->frames) g_return_val_if_fail(icon->raw_len != NULL, FALSE); icon->frames++; @@ -763,6 +767,9 @@ notify_icon_add_frame_from_uri(NotifyIcon *icon, const char *uri) g_return_val_if_fail(icon->uri != NULL, FALSE); } + /* check for integer overflow */ + g_return_val_if_fail(icon->frames + 1 < INT_MAX, FALSE); + icon->frames++; icon->uri = g_realloc(icon->uri, sizeof(char *) * icon->frames); icon->uri[icon->frames - 1] = g_strdup(uri); |