comparison subreader.c @ 15382:ba07942279c5

strdup() of a NULL pointer, truckload of cola for me

15381:3b9f6e52a4cb

	mp_msg(MSGT_SUBREADER, MSGL_V, "%s ", languages[i]);
    }
    mp_msg(MSGT_SUBREADER, MSGL_V, "\n");
    
    for (i = 0; i < langcnt; i++) {
	if (strcasecmp(languages[i], preferred_language) != 0) continue;
	analyser = enca_analyser_alloc(languages[i]);
	encoding = enca_analyse_const(analyser, buffer, buflen);
	mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detected charset: %s\n", enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV));
	detected_sub_cp = strdup(enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV));
	enca_analyser_free(analyser);
    }
    
    free(languages);
    free(buffer);
    rewind(fd);

    if (!detected_sub_cp) detected_sub_cp = strdup(fallback);

    return detected_sub_cp;
}
#endif

15382:ba07942279c5

	mp_msg(MSGT_SUBREADER, MSGL_V, "%s ", languages[i]);
    }
    mp_msg(MSGT_SUBREADER, MSGL_V, "\n");
    
    for (i = 0; i < langcnt; i++) {
	char *tmp;
	
	if (strcasecmp(languages[i], preferred_language) != 0) continue;
	analyser = enca_analyser_alloc(languages[i]);
	encoding = enca_analyse_const(analyser, buffer, buflen);
	tmp = enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV);
	if (tmp) {
	    detected_sub_cp = strdup(tmp);
	    mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detected charset: %s\n", tmp);
	}
	enca_analyser_free(analyser);
    }
    
    free(languages);
    free(buffer);
    rewind(fd);

    if (!detected_sub_cp) {
	detected_sub_cp = strdup(fallback);
	mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detection failed: fallback to %s\n", fallback);
    }

    return detected_sub_cp;
}
#endif