Attachment #354314 for bug #473084




++ b/src/vdpau_wrapper.c

{
    FILE *fp;
    char buffer[1024];
    int ret, i;

    fp = fopen("/proc/self/maps", "r");
    if (!fp) {
        return;
    }
    ret = fread(buffer, 1, sizeof(buffer) - 1, fp);
    fclose(fp);
    if (ret < 0) {
        return;
    }
    /*
     * Sometimes the file contains null between arguments. Wipe these out so
     * strstr doesn't stop early.
     */
    for (i = 0; i < ret; i++) {
        if (buffer[i] == '\0') {
            buffer[i] = 'x';
        }
    }
    buffer[ret] = '\0';

    while( fgets(buffer, sizeof(buffer), fp)) {
        if (strstr(buffer, "libflashplayer") != NULL)
            _running_under_flash = 1;
            break;
    }

    fclose(fp);

}

void init_config(void)

Return to bug 473084

Line Link Here

(-)file_not_specified_in_diff (-20 / +9 lines)
0	-- a/src/vdpau_wrapper.c	0	++ b/src/vdpau_wrapper.c
Lines 301-331 Link Here
301	{	313	{
302	FILE *fp;	314	FILE *fp;
303	char buffer[1024];	315	char buffer[1024];
304	int ret, i;
305		316
306	fp = fopen("/proc/self/cmdline", "r");	317	fp = fopen("/proc/self/maps", "r");
307	if (!fp) {	318	if (!fp) {
308	return;	319	return;
309	}	320	}
310	ret = fread(buffer, 1, sizeof(buffer) - 1, fp);
311	fclose(fp);
312	if (ret < 0) {
313	return;
314	}
315	/*
316	* Sometimes the file contains null between arguments. Wipe these out so
317	* strstr doesn't stop early.
318	*/
319	for (i = 0; i < ret; i++) {
320	if (buffer[i] == '\0') {
321	buffer[i] = 'x';
322	}
323	}
324	buffer[ret] = '\0';
325		321
326	if (strstr(buffer, "libflashplayer") != NULL) {	322	while( fgets(buffer, sizeof(buffer), fp)) {
327	_running_under_flash = 1;	323	if (strstr(buffer, "libflashplayer") != NULL)
		324	_running_under_flash = 1;
		325	break;
328	}	326	}
		327
		328	fclose(fp);
		329
329	}	330	}
330		331
331	void init_config(void)	332	void init_config(void)