From 7ecfb60598caa8d6e833ac288bb6b5fd0905b556 Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 10 Aug 2003 15:14:47 +0000
Subject: [PATCH] 10l

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10556 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 subreader.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/subreader.c b/subreader.c
index 0b47532100..804436f6bd 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1028,8 +1028,9 @@ subtitle* subcp_recode1 (subtitle *sub)
 #endif
 
 #ifdef USE_FRIBIDI
-#define ALLOCATE(tp,ln) ((tp *) malloc (sizeof (tp) * (ln)))
+#ifndef max
 #define max(a,b)  (((a)>(b))?(a):(b))
+#endif
 subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
 {
   FriBidiChar logical[LINE_LEN+1], visual[LINE_LEN+1]; // Hopefully these two won't smash the stack
@@ -1063,6 +1064,7 @@ subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
     if(log2vis) {
       len = fribidi_remove_bidi_marks (visual, len, NULL, NULL,
 				       NULL);
+      if((op = (char*)malloc(sizeof(char)*(max(2*orig_len,2*len) + 1))) == NULL) {
       if((op = ALLOCATE(char,(max(2*orig_len,2*len) + 1))) == NULL) {
 	mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error allocating mem.\n");
 	l++;
@@ -1732,7 +1734,7 @@ char** sub_filenames(char* path, char *fname)
 		    if (prio) {
 			prio += prio;
 #ifdef USE_ICONV
-			if (i<3) // prefer UTF-8 coded
+			if (sub_cp) // prefer UTF-8 coded
 			    prio++;
 #endif
 			sprintf(tmpresult, "%s%s", j == 0 ? f_dir : path, de->d_name);