Merge pull request opencv#10260 from native-api:ffmpeg_load_from_package

alalek · alalek · commit 66e09bc9a40b · 2017-12-08T20:58:17.000Z
diff --git a/modules/videoio/src/cap_ffmpeg.cpp b/modules/videoio/src/cap_ffmpeg.cpp
@@ -124,8 +124,10 @@ class icvInitFFMPEG
             if (m)
             {
                 wchar_t path[MAX_PATH];
-                size_t sz = GetModuleFileNameW(m, path, sizeof(path));
-                if (sz > 0 && ERROR_SUCCESS == GetLastError())
+                const size_t path_size = sizeof(path)/sizeof(*path);
+                size_t sz = GetModuleFileNameW(m, path, path_size);
+                /* Don't handle paths longer than MAX_PATH until that becomes a real issue */
+                if (sz > 0 && sz < path_size)
                 {
                     wchar_t* s = wcsrchr(path, L'\\');
                     if (s)

Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,10 @@ class icvInitFFMPEG`
`124`	`124`	`if (m)`
`125`	`125`	`{`
`126`	`126`	`wchar_t path[MAX_PATH];`
`127`		`- size_t sz = GetModuleFileNameW(m, path, sizeof(path));`
`128`		`- if (sz > 0 && ERROR_SUCCESS == GetLastError())`
	`127`	`+ const size_t path_size = sizeof(path)/sizeof(*path);`
	`128`	`+ size_t sz = GetModuleFileNameW(m, path, path_size);`
	`129`	`+ /* Don't handle paths longer than MAX_PATH until that becomes a real issue */`
	`130`	`+ if (sz > 0 && sz < path_size)`
`129`	`131`	`{`
`130`	`132`	`wchar_t* s = wcsrchr(path, L'\\');`
`131`	`133`	`if (s)`