fix nlohmann#1982: contains() exceptions are incorrectly raised

dota17 · Mar 26, 2020 · 1d7f337 · 1d7f337
1 parent e07686f
commit 1d7f337
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp
@@ -679,14 +679,26 @@ class json_pointer
                         return false;
                     }
 
-                    const auto idx = static_cast<size_type>(array_index(reference_token));
-                    if (idx >= ptr->size())
+                    JSON_TRY
+                    {
+                        const auto idx = static_cast<size_type>(array_index(reference_token));
+                        if (idx >= ptr->size())
+                        {
+                            // index out of range
+                            return false;
+                        }
+
+                        ptr = &ptr->operator[](idx);
+                        break;
+                    }
+                    JSON_CATCH(detail::parse_error&)
+                    {
+                        return false;
+                    }
+                    JSON_CATCH(detail::out_of_range&)
                     {
-                        // index out of range
                         return false;
                     }
-
-                    ptr = &ptr->operator[](idx);
                     break;
                 }
 

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -10753,14 +10753,26 @@ class json_pointer
                         return false;
                     }
 
-                    const auto idx = static_cast<size_type>(array_index(reference_token));
-                    if (idx >= ptr->size())
+                    JSON_TRY
+                    {
+                        const auto idx = static_cast<size_type>(array_index(reference_token));
+                        if (idx >= ptr->size())
+                        {
+                            // index out of range
+                            return false;
+                        }
+
+                        ptr = &ptr->operator[](idx);
+                        break;
+                    }
+                    JSON_CATCH(detail::parse_error&)
+                    {
+                        return false;
+                    }
+                    JSON_CATCH(detail::out_of_range&)
                     {
-                        // index out of range
                         return false;
                     }
-
-                    ptr = &ptr->operator[](idx);
                     break;
                 }