Merge pull request opencv#10170 from LaurentBerger:Issue10166

vpisarev · vpisarev · commit 614e2543316b · 2017-11-29T09:51:20.000Z
diff --git a/modules/core/include/opencv2/core.hpp b/modules/core/include/opencv2/core.hpp
@@ -3139,6 +3139,7 @@ class CV_EXPORTS_W Algorithm
     template<typename _Tp> static Ptr<_Tp> load(const String& filename, const String& objname=String())
     {
         FileStorage fs(filename, FileStorage::READ);
+        CV_Assert(fs.isOpened());
         FileNode fn = objname.empty() ? fs.getFirstTopLevelNode() : fs[objname];
         if (fn.empty()) return Ptr<_Tp>();
         Ptr<_Tp> obj = _Tp::create();
diff --git a/modules/ml/src/ann_mlp.cpp b/modules/ml/src/ann_mlp.cpp
@@ -1399,7 +1399,7 @@ Ptr<ANN_MLP> ANN_MLP::load(const String& filepath)
 {
     FileStorage fs;
     fs.open(filepath, FileStorage::READ);
-
+    CV_Assert(fs.isOpened());
     Ptr<ANN_MLP> ann = makePtr<ANN_MLPImpl>();
 
     ((ANN_MLPImpl*)ann.get())->read(fs.getFirstTopLevelNode());

Original file line number	Diff line number	Diff line change
`@@ -3139,6 +3139,7 @@ class CV_EXPORTS_W Algorithm`
`3139`	`3139`	`template<typename _Tp> static Ptr<_Tp> load(const String& filename, const String& objname=String())`
`3140`	`3140`	`{`
`3141`	`3141`	`FileStorage fs(filename, FileStorage::READ);`
	`3142`	`+ CV_Assert(fs.isOpened());`
`3142`	`3143`	`FileNode fn = objname.empty() ? fs.getFirstTopLevelNode() : fs[objname];`
`3143`	`3144`	`if (fn.empty()) return Ptr<_Tp>();`
`3144`	`3145`	`Ptr<_Tp> obj = _Tp::create();`
Original file line number	Diff line number	Diff line change
`@@ -1399,7 +1399,7 @@ Ptr<ANN_MLP> ANN_MLP::load(const String& filepath)`
`1399`	`1399`	`{`
`1400`	`1400`	`FileStorage fs;`
`1401`	`1401`	`fs.open(filepath, FileStorage::READ);`
`1402`		`-`
	`1402`	`+ CV_Assert(fs.isOpened());`
`1403`	`1403`	`Ptr<ANN_MLP> ann = makePtr<ANN_MLPImpl>();`
`1404`	`1404`
`1405`	`1405`	`((ANN_MLPImpl*)ann.get())->read(fs.getFirstTopLevelNode());`