Merge pull request #214 from naivisoftware/fix_propertypath

cklosters · web-flow · commit 7a1065b1e6b0 · 2022-08-08T11:55:56.000+02:00
Fix access violation in PropertyPath::getParent propertyPath construction
diff --git a/tools/napkin/src/propertypath.cpp b/tools/napkin/src/propertypath.cpp
@@ -394,7 +394,7 @@ PropertyPath PropertyPath::getParent() const
 	if (hasProperty())
 	{
 		if (mPropertyPath.size() > 1)
-			return { mObjectPath, PPath(mPropertyPath.begin(), mObjectPath.begin() + mObjectPath.size() - 1), *mDocument };
+			return { mObjectPath, PPath(mPropertyPath.begin(), mPropertyPath.begin() + mPropertyPath.size() - 1), *mDocument };
 
 		if (mPropertyPath.size() == 1)
 			return { mObjectPath, *mDocument };

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ PropertyPath PropertyPath::getParent() const`
`394`	`394`	`if (hasProperty())`
`395`	`395`	`{`
`396`	`396`	`if (mPropertyPath.size() > 1)`
`397`		`- return { mObjectPath, PPath(mPropertyPath.begin(), mObjectPath.begin() + mObjectPath.size() - 1), *mDocument };`
	`397`	`+ return { mObjectPath, PPath(mPropertyPath.begin(), mPropertyPath.begin() + mPropertyPath.size() - 1), *mDocument };`
`398`	`398`
`399`	`399`	`if (mPropertyPath.size() == 1)`
`400`	`400`	`return { mObjectPath, *mDocument };`