comparison libass/ass.c @ 35701:c7866af24567

Updated libass to 7e45532 - Removes a redundant warning message - Fixes a wrong condition - Fixes a leak when an error occurs
author SubJunk
date Sat, 19 Jan 2013 21:47:31 +0000
parents 49fc594fda43
children d0004e3bcbbc
comparison
equal deleted inserted replaced
35700:7820bad7c1f8 35701:c7866af24567
986 op = outbuf + offset; 986 op = outbuf + offset;
987 osize += size; 987 osize += size;
988 oleft += size; 988 oleft += size;
989 } else { 989 } else {
990 ass_msg(library, MSGL_WARN, "Error recoding file"); 990 ass_msg(library, MSGL_WARN, "Error recoding file");
991 return NULL; 991 free(outbuf);
992 outbuf = NULL;
993 goto out;
992 } 994 }
993 } else if (clear) 995 } else if (clear)
994 break; 996 break;
995 } 997 }
996 outbuf[osize - oleft - 1] = 0; 998 outbuf[osize - oleft - 1] = 0;
997 } 999 }
998 1000
1001 out:
999 if (icdsc != (iconv_t) (-1)) { 1002 if (icdsc != (iconv_t) (-1)) {
1000 (void) iconv_close(icdsc); 1003 (void) iconv_close(icdsc);
1001 icdsc = (iconv_t) (-1); 1004 icdsc = (iconv_t) (-1);
1002 ass_msg(library, MSGL_V, "Closed iconv descriptor"); 1005 ass_msg(library, MSGL_V, "Closed iconv descriptor");
1003 } 1006 }