Explicitly check the value of a boolean JSON object member.

CleverRaven · Dec 25, 2019 · 328dd45 · 328dd45
1 parent 8690cb4
commit 328dd45
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/npctalk.cpp b/src/npctalk.cpp
@@ -2918,6 +2918,10 @@ dynamic_line_t::dynamic_line_t( const JsonObject &jo )
         const dynamic_line_t no = from_member( jo, "no" );
         for( const std::string &sub_member : dialogue_data::simple_string_conds ) {
             if( jo.has_bool( sub_member ) ) {
+                // This also marks the member as visited.
+                if( !jo.get_bool( sub_member ) ) {
+                    jo.throw_error( "value must be true", sub_member );
+                }
                 dcondition = conditional_t<dialogue>( sub_member );
                 function = [dcondition, yes, no]( const dialogue & d ) {
                     return ( dcondition( d ) ? yes : no )( d );