fix dangling reference in parser::Parse with shared_ptr

solo-io · Mar 15, 2024 · f99b998 · f99b998
1 parent 2c441a3
commit f99b998
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/include/inja/environment.hpp b/include/inja/environment.hpp
@@ -105,7 +105,7 @@ class Environment {
 
   Template parse(std::string_view input) {
     Parser parser(parser_config, lexer_config, template_storage, function_storage);
-    return parser.parse(input, input_path);
+    return *parser.parse(input, input_path);
   }
 
   Template parse_template(const std::string& filename) {

diff --git a/include/inja/parser.hpp b/include/inja/parser.hpp
@@ -621,9 +621,9 @@ class Parser {
                   const FunctionStorage& function_storage)
       : config(parser_config), lexer(lexer_config), template_storage(template_storage), function_storage(function_storage) {}
 
-  Template parse(std::string_view input, std::string_view path) {
-    auto result = Template(static_cast<std::string>(input));
-    parse_into(result, path);
+  std::shared_ptr<Template> parse(std::string_view input, std::string_view path) {
+    auto result = std::make_shared<Template>(static_cast<std::string>(input));
+    parse_into(*result, path);
     return result;
   }
 

diff --git a/single_include/inja/inja.hpp b/single_include/inja/inja.hpp
@@ -2059,9 +2059,9 @@ class Parser {
                   const FunctionStorage& function_storage)
       : config(parser_config), lexer(lexer_config), template_storage(template_storage), function_storage(function_storage) {}
 
-  Template parse(std::string_view input, std::string_view path) {
-    auto result = Template(static_cast<std::string>(input));
-    parse_into(result, path);
+  std::shared_ptr<Template> parse(std::string_view input, std::string_view path) {
+    auto result = std::make_shared<Template>(static_cast<std::string>(input));
+    parse_into(*result, path);
     return result;
   }
 
@@ -2834,7 +2834,7 @@ class Environment {
 
   Template parse(std::string_view input) {
     Parser parser(parser_config, lexer_config, template_storage, function_storage);
-    return parser.parse(input, input_path);
+    return *parser.parse(input, input_path);
   }
 
   Template parse_template(const std::string& filename) {