summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-17 15:33:12 +0200
committerwm4 <wm4@nowhere>2013-09-17 15:41:23 +0200
commit82de39b7d59e7863a878f87803d6d1b3346bbf8e (patch)
treec0351329db33f8c860752553c3526da90151c7ff /sub
parent95a2151d199e7e77979fa54ff500d02bf8d8b377 (diff)
downloadmpv-82de39b7d59e7863a878f87803d6d1b3346bbf8e.tar.bz2
mpv-82de39b7d59e7863a878f87803d6d1b3346bbf8e.tar.xz
find_subfiles: fix really dumb bug causing segfaults
NULL pointer deref when a .sub file with the same filename as the video file was present. I was probably half asleep when writing this code.
Diffstat (limited to 'sub')
-rw-r--r--sub/find_subfiles.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c
index 691c0148d3..a5b1bdeb22 100644
--- a/sub/find_subfiles.c
+++ b/sub/find_subfiles.c
@@ -208,7 +208,7 @@ static void filter_subidx(struct subfn **slist, int *nsub)
if (case_endswith(fname, ".idx")) {
prev = fname;
} else if (case_endswith(fname, ".sub")) {
- if (strncmp(prev, fname, strlen(fname) - 4) == 0)
+ if (prev && strncmp(prev, fname, strlen(fname) - 4) == 0)
(*slist)[n].priority = -1;
}
}