Attachment #76487 for bug #107922




		    continue;
		}

		if (strncasecmp(buffer, "mplayer", 7) == 0) {
		    snprintf(parse, 1000, "%s", strtok(buffer, "="));
		    snprintf(parse, 1000, "%s", strtok(NULL, "=\n"));
		    if (instance->mplayer_binary != NULL)
			free(instance->mplayer_binary);
		    if (strstr(parse, "`") == NULL)	// don't allow shell commands
			instance->mplayer_binary = strdup(parse);
		    continue;
		}

		if (strncasecmp(buffer, "dload-dir", 9) == 0) {
		    snprintf(parse, 1000, "%s", strtok(buffer, "="));
		    snprintf(parse, 1000, "%s", strtok(NULL, "=\n"));

Lines 360-367 Link Here

(-)mplayerplug-in.orig/Source/plugin-threads.cpp (-2 / +9 lines)
360	}	360	}
361		361
362	i = 0;	362	i = 0;
363	snprintf(buffer, 1024, "mplayer");	363
364	instance->td->argv[i++] = strdup(buffer);	364	if (instance->mplayer_binary) {
		365	snprintf(buffer, 1024, "%s", instance->mplayer_binary);
		366	instance->td->argv[i++] = strdup(buffer);
		367	} else {
		368	snprintf(buffer, 1024, "mplayer");
		369	instance->td->argv[i++] = strdup(buffer);
		370	}
		371
365	if (instance->novop == 1) {	372	if (instance->novop == 1) {
366	snprintf(buffer, 1024, "-vop");	373	snprintf(buffer, 1024, "-vop");
367	instance->td->argv[i++] = strdup(buffer);	374	instance->td->argv[i++] = strdup(buffer);

Lines 273-278 Link Here

(-)mplayerplug-in.orig/Source/plugin.cpp (+6 lines)
273	keep_download = 0;	273	keep_download = 0;
274	maintain_aspect = 1;	274	maintain_aspect = 1;
275	download_dir = strdup(getenv("HOME"));	275	download_dir = strdup(getenv("HOME"));
		276	mplayer_binary = NULL;
276	cachesize = 512;	277	cachesize = 512;
277	output_display = NULL;	278	output_display = NULL;
278	osdlevel = 0;	279	osdlevel = 0;
Lines 548-553 Link Here
548	download_dir = NULL;	549	download_dir = NULL;
549	}	550	}
550		551
		552	if (mplayer_binary != NULL) {
		553	free(mplayer_binary);
		554	mplayer_binary = NULL;
		555	}
		556
551	if (td->list != NULL) {	557	if (td->list != NULL) {
552	pthread_mutex_lock(&playlist_mutex);	558	pthread_mutex_lock(&playlist_mutex);
553	deleteList(td->list);	559	deleteList(td->list);

Lines 347-352 Link Here

(-)mplayerplug-in.orig/Source/plugin.h (+1 lines)
347	int maintain_aspect;	347	int maintain_aspect;
348	int qt_speed;	348	int qt_speed;
349	char *download_dir;	349	char *download_dir;
		350	char *mplayer_binary;
350	int cachesize;	351	int cachesize;
351	char *output_display;	352	char *output_display;
352	int osdlevel;	353	int osdlevel;

Lines 18-20 Link Here

(-)mplayerplug-in.orig/mplayerplug-in.conf (+1 lines)
18	#mc=1	18	#mc=1
19	#black-background=0	19	#black-background=0
20	#user-agent=NSPlayer	20	#user-agent=NSPlayer
		21	#mplayer=mplayer-bin

Return to bug 107922

Lines 1236-1241 Link Here

(-)mplayerplug-in.orig/Source/plugin-setup.cpp (+10 lines)
1236	continue;	1236	continue;
1237	}	1237	}
1238		1238
		1239	if (strncasecmp(buffer, "mplayer", 7) == 0) {
		1240	snprintf(parse, 1000, "%s", strtok(buffer, "="));
		1241	snprintf(parse, 1000, "%s", strtok(NULL, "=\n"));
		1242	if (instance->mplayer_binary != NULL)
		1243	free(instance->mplayer_binary);
		1244	if (strstr(parse, "`") == NULL) // don't allow shell commands
		1245	instance->mplayer_binary = strdup(parse);
		1246	continue;
		1247	}
		1248
1239	if (strncasecmp(buffer, "dload-dir", 9) == 0) {	1249	if (strncasecmp(buffer, "dload-dir", 9) == 0) {
1240	snprintf(parse, 1000, "%s", strtok(buffer, "="));	1250	snprintf(parse, 1000, "%s", strtok(buffer, "="));
1241	snprintf(parse, 1000, "%s", strtok(NULL, "=\n"));	1251	snprintf(parse, 1000, "%s", strtok(NULL, "=\n"));