# HG changeset patch # User cboesch # Date 1297106837 0 # Node ID 93629a05a38048a5abcf6386179a66a4e2196e1e # Parent b3782b0b1d924217f5472ed61fb39e06e7bc5f5b Handle mp_path_join failure in load_vob_subtitle. diff -r b3782b0b1d92 -r 93629a05a380 sub/subreader.c --- a/sub/subreader.c Sun Feb 06 19:01:52 2011 +0000 +++ b/sub/subreader.c Mon Feb 07 19:27:17 2011 +0000 @@ -2194,6 +2194,8 @@ mp_subdir = get_path("sub/"); if (mp_subdir) { char *psub = mp_path_join(mp_subdir, mp_basename(name)); + if (!psub) + goto out; add_f(psub, ifo, 0, spu); free(psub); }