[MPlayer-dev-eng] [PATCH] bug in input.c causing random sig11, osd bug in vo_aa.c

[Jindrich Makovicka]

Hello,

this patch attempts to fix uninitialized args[i].type, which occasionally
caused segfaults in mp_cmd_free when type got set to 2 and argument was
something other than a string.

--- input.c	Thu Jul 18 18:45:50 2002
+++ input.c.new	Thu Jul 18 18:49:24 2002
@@ -447,6 +447,7 @@
     if(!ptr) break;
     while(ptr[0] == ' ' || ptr[0] == '\t') ptr++;
     if(ptr[0] == '\0') break;	
+    cmd->args[i].type = cmd_def->args[i].type;
     switch(cmd_def->args[i].type) {
     case MP_CMD_ARG_INT:
       errno = 0;

This one fixes the osd stuff in AAlib output - it displayed bogus characters
at the start of mplayer, when vo_osd_text was empty.

--- vo_aa.c	Thu Jul 18 18:46:31 2002
+++ vo_aa.c.new	Thu Jul 18 18:48:43 2002
@@ -200,7 +200,7 @@
     /* 
      * places the mplayer status osd
      */
-  if (vo_osd_text) {
+  if (vo_osd_text && (vo_osd_text[0] != 0)) {
     int len;
     if(vo_osd_text[0] < 32) {
       len = strlen(__sub_osd_names_short[vo_osd_text[0]]) + strlen(vo_osd_text+1) + 2;

Regards,			   

-- 
Jindrich Makovicka