Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.35,1.36 plugin-threads.cpp,1.108,1.109
Brought to you by:
kdekorte
[Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.cpp,1.35,1.36 plugin-threads.cpp,1.108,1.109
From: Kevin D. <kde...@us...> - 2004-08-29 17:43:08
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2513/Source Modified Files: plugin-setup.cpp plugin-threads.cpp Log Message: Fix memory leak in playPlaylist Index: plugin-setup.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** plugin-setup.cpp 29 Aug 2004 15:22:17 -0000 1.35 --- plugin-setup.cpp 29 Aug 2004 17:42:56 -0000 1.36 *************** *** 477,481 **** } ! if (strncasecmp(parameters->argn[i], "showcontrols", 11) == 0) { lowercase(parameters->argv[i]); --- 477,482 ---- } ! if ((strncasecmp(parameters->argn[i], "showcontrols", 11) == 0) ! || ((strncasecmp(parameters->argn[i], "controls", 8) == 0) && (strstr(instance->mimetype, "quicktime") != NULL))) { lowercase(parameters->argv[i]); Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** plugin-threads.cpp 29 Aug 2004 15:22:17 -0000 1.108 --- plugin-threads.cpp 29 Aug 2004 17:42:57 -0000 1.109 *************** *** 1422,1426 **** pthread_mutex_lock(&(local_td->instance->control_mutex)); local_td->instance->js_state = JS_STATE_UNDEFINED; ! local_td->argv[base_argc+1] = NULL; pthread_mutex_unlock(&(local_td->instance->control_mutex)); --- 1422,1431 ---- pthread_mutex_lock(&(local_td->instance->control_mutex)); local_td->instance->js_state = JS_STATE_UNDEFINED; ! argc = base_argc; ! while (argc < 50) { ! if (local_td->argv[argc] != NULL) ! free(local_td->argv[argc]); ! local_td->argv[argc++] = NULL; ! } pthread_mutex_unlock(&(local_td->instance->control_mutex)); |