From: Darren S. <ds...@us...> - 2005-04-25 22:41:13
|
Update of /cvsroot/xine/gnome-xine/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8673/src Modified Files: drag_drop.c player.c Log Message: Fix potential off-by-one in multiple DnD. Index: drag_drop.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/drag_drop.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- drag_drop.c 31 Jan 2005 19:04:45 -0000 1.8 +++ drag_drop.c 25 Apr 2005 22:40:50 -0000 1.9 @@ -45,9 +45,9 @@ while (++i < data->length) { char c = data->data[i]; - if (++len < MAX_MRL_LEN - 1 && c != '\r' && c != '\n') - str[len] = c; - else if ((c == '\r' || c == '\n') && len) + if (len < MAX_MRL_LEN - 2 && c != '\r' && c != '\n') + str[++len] = c; + else if ((c == '\r' || c == '\n') && len > 0) { str[len] = 0; if (first < 0) Index: player.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/player.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- player.c 21 Apr 2005 19:16:44 -0000 1.31 +++ player.c 25 Apr 2005 22:40:50 -0000 1.32 @@ -972,9 +972,11 @@ } -void player_init (void) { - +void player_init (void) +{ +/* se_o_t *controls_obj; + */ cur_mrl = NULL; @@ -1017,39 +1019,39 @@ SE_GROUP_ENGINE, N_("[file name]"), NULL }, { "set_speed", js_set_speed, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool]"), NULL }, + SE_GROUP_PROPERTIES, N_("int"), N_("deprecated") }, { "get_speed", js_get_speed, 0, 0, - SE_GROUP_PROPERTIES, NULL, NULL }, + SE_GROUP_PROPERTIES, NULL, N_("deprecated") }, { "set_volume", js_set_volume, 0, 0, SE_GROUP_PROPERTIES, N_("int"), N_("deprecated") }, { "get_volume", js_get_volume, 0, 0, SE_GROUP_PROPERTIES, NULL, N_("deprecated") }, { "set_mute", js_set_mute, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool]"), NULL }, + SE_GROUP_PROPERTIES, N_("[bool]"), N_("deprecated") }, { "get_mute", js_get_mute, 0, 0, - SE_GROUP_PROPERTIES, NULL, NULL }, + SE_GROUP_PROPERTIES, NULL, N_("deprecated") }, { "set_zoom", js_set_zoom, 0, 0, - SE_GROUP_PROPERTIES, N_("int"), NULL }, + SE_GROUP_PROPERTIES, N_("int"), N_("deprecated") }, { "get_zoom", js_get_zoom, 0, 0, - SE_GROUP_PROPERTIES, NULL, NULL }, + SE_GROUP_PROPERTIES, NULL, N_("deprecated") }, { "set_video_size", js_set_video_size, 0, 0, - SE_GROUP_PROPERTIES, N_("int"), NULL }, + SE_GROUP_PROPERTIES, N_("int"), N_("deprecated") }, { "set_fullscreen", js_set_fullscreen, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool]"), NULL }, + SE_GROUP_PROPERTIES, N_("[bool]"), N_("deprecated") }, { "set_aspect", js_set_aspect, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool]"), NULL }, + SE_GROUP_PROPERTIES, N_("[bool]"), N_("deprecated") }, { "set_sub", js_set_sub, 0, 0, - SE_GROUP_PROPERTIES, N_("int"), NULL }, + SE_GROUP_PROPERTIES, N_("int"), N_("deprecated") }, { "set_deinterlace", js_set_deinterlace, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool]"), NULL }, + SE_GROUP_PROPERTIES, N_("[bool]"), N_("deprecated") }, { "set_postproc_video", js_set_postproc_video, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool|string]"), NULL }, + SE_GROUP_PROPERTIES, N_("[bool|string]"), N_("deprecated") }, { "set_postproc_audio", js_set_postproc_audio, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool|string]"), NULL }, + SE_GROUP_PROPERTIES, N_("[bool|string]"), N_("deprecated") }, { "set_auto_resize", js_set_auto_resize, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool]"), NULL }, + SE_GROUP_PROPERTIES, N_("[bool]"), N_("deprecated") }, { "set_auto_rescale", js_set_auto_rescale, 0, 0, - SE_GROUP_PROPERTIES, N_("[bool]"), N_("magnify low-res video") }, + SE_GROUP_PROPERTIES, N_("[bool]"), N_("magnify low-res video; deprecated") }, { "is_live_stream", js_is_live_stream, 0, 0, SE_GROUP_PROPERTIES, NULL, NULL }, |