# HG changeset patch # User js # Date 1169059757 28800 # Node ID 89453f4a42788f7092ff443bedf16f62b0e8c03e # Parent f5ed9a6ad3f16d2f82bcc6315ae73c1f9c4efd63 [svn] Fixed possible buffer overflow. diff -r f5ed9a6ad3f1 -r 89453f4a4278 ChangeLog --- a/ChangeLog Wed Jan 17 09:14:03 2007 -0800 +++ b/ChangeLog Wed Jan 17 10:49:17 2007 -0800 @@ -1,3 +1,12 @@ +2007-01-17 17:14:03 +0000 Giacomo Lozito + revision [998] + - evdev-plug: added volume->mute and win->jumptofile actions + trunk/src/evdev-plug/ed.c | 44 +++++++++++++++++++++++++++++++++++++- + trunk/src/evdev-plug/ed_actions.h | 4 ++- + trunk/src/evdev-plug/ed_ui.c | 3 +- + 3 files changed, 48 insertions(+), 3 deletions(-) + + 2007-01-17 16:52:04 +0000 Giacomo Lozito revision [996] - status icon plugin: better logic for KWin workaround diff -r f5ed9a6ad3f1 -r 89453f4a4278 src/wavpack/tags.h --- a/src/wavpack/tags.h Wed Jan 17 09:14:03 2007 -0800 +++ b/src/wavpack/tags.h Wed Jan 17 10:49:17 2007 -0800 @@ -4,6 +4,7 @@ #include const int MAX_LEN = 2048; +const int MAX_LEN = 128; const int TAG_NONE = 0; const int TAG_ID3 = 1; const int TAG_APE = 2; @@ -14,8 +15,8 @@ char album [MAX_LEN]; char comment [MAX_LEN]; char genre [MAX_LEN]; - char track [128]; - char year [128]; + char track [MAX_LEN2]; + char year [MAX_LEN2]; int _genre; } ape_tag; diff -r f5ed9a6ad3f1 -r 89453f4a4278 src/wavpack/ui.cxx --- a/src/wavpack/ui.cxx Wed Jan 17 09:14:03 2007 -0800 +++ b/src/wavpack/ui.cxx Wed Jan 17 10:49:17 2007 -0800 @@ -85,13 +85,13 @@ { ape_tag Tag; - strcpy(Tag.title, gtk_entry_get_text(GTK_ENTRY(title_entry))); - strcpy(Tag.artist, gtk_entry_get_text(GTK_ENTRY(performer_entry))); - strcpy(Tag.album, gtk_entry_get_text(GTK_ENTRY(album_entry))); - strcpy(Tag.comment, gtk_entry_get_text(GTK_ENTRY(user_comment_entry))); - strcpy(Tag.track, gtk_entry_get_text(GTK_ENTRY(tracknumber_entry))); - strcpy(Tag.year, gtk_entry_get_text(GTK_ENTRY(date_entry))); - strcpy(Tag.genre, gtk_entry_get_text(GTK_ENTRY(genre_entry))); + strncpy(Tag.title, gtk_entry_get_text(GTK_ENTRY(title_entry)), MAX_LEN); + strncpy(Tag.artist, gtk_entry_get_text(GTK_ENTRY(performer_entry)), MAX_LEN); + strncpy(Tag.album, gtk_entry_get_text(GTK_ENTRY(album_entry)), MAX_LEN); + strncpy(Tag.comment, gtk_entry_get_text(GTK_ENTRY(user_comment_entry)), MAX_LEN); + strncpy(Tag.track, gtk_entry_get_text(GTK_ENTRY(tracknumber_entry)), MAX_LEN2); + strncpy(Tag.year, gtk_entry_get_text(GTK_ENTRY(date_entry)), MAX_LEN2); + strncpy(Tag.genre, gtk_entry_get_text(GTK_ENTRY(genre_entry)), MAX_LEN); WriteAPE2Tag(filename, &Tag); g_free(filename); gtk_widget_destroy(window);