improve: ItemAttribute Safety Improvements (zimbadev#550)

jprzimba · web-flow · commit 8a15e8020b41 · 2025-12-19T09:15:44.000-03:00
diff --git a/src/items/functions/item/attribute.cpp b/src/items/functions/item/attribute.cpp
@@ -53,11 +53,9 @@ const int64_t &ItemAttribute::getAttributeValue(ItemAttribute_t type) const {
 }
 
 const Attributes* ItemAttribute::getAttribute(ItemAttribute_t type) const {
-	if (hasAttribute(type)) {
-		for (const Attributes &attribute : attributeVector) {
-			if (attribute.getAttributeType() == type) {
-				return &attribute;
-			}
+	for (auto it = attributeVector.cbegin(); it != attributeVector.cend(); ++it) {
+		if (it->getAttributeType() == type) {
+			return &*it;
 		}
 	}
 	return nullptr;
@@ -120,10 +118,12 @@ const std::map<std::string, CustomAttribute, std::less<>> &ItemAttribute::getCus
 =============================
 */
 const CustomAttribute* ItemAttribute::getCustomAttribute(const std::string &attributeName) const {
-	if (customAttributeMap.contains(asLowerCaseString(attributeName))) {
-		return &customAttributeMap.at(asLowerCaseString(attributeName));
+	const auto key = asLowerCaseString(attributeName);
+	const auto it = customAttributeMap.find(key);
+	if (it == customAttributeMap.end()) {
+		return nullptr;
 	}
-	return nullptr;
+	return &it->second;
 }
 
 void ItemAttribute::setCustomAttribute(const std::string &key, const int64_t value) {

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,9 @@ const int64_t &ItemAttribute::getAttributeValue(ItemAttribute_t type) const {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`const Attributes* ItemAttribute::getAttribute(ItemAttribute_t type) const {`
`56`		`- if (hasAttribute(type)) {`
`57`		`- for (const Attributes &attribute : attributeVector) {`
`58`		`- if (attribute.getAttributeType() == type) {`
`59`		`- return &attribute;`
`60`		`- }`
	`56`	`+ for (auto it = attributeVector.cbegin(); it != attributeVector.cend(); ++it) {`
	`57`	`+ if (it->getAttributeType() == type) {`
	`58`	`+ return &*it;`
`61`	`59`	`}`
`62`	`60`	`}`
`63`	`61`	`return nullptr;`
`@@ -120,10 +118,12 @@ const std::map<std::string, CustomAttribute, std::less<>> &ItemAttribute::getCus`
`120`	`118`	`=============================`
`121`	`119`	`*/`
`122`	`120`	`const CustomAttribute* ItemAttribute::getCustomAttribute(const std::string &attributeName) const {`
`123`		`- if (customAttributeMap.contains(asLowerCaseString(attributeName))) {`
`124`		`- return &customAttributeMap.at(asLowerCaseString(attributeName));`
	`121`	`+ const auto key = asLowerCaseString(attributeName);`
	`122`	`+ const auto it = customAttributeMap.find(key);`
	`123`	`+ if (it == customAttributeMap.end()) {`
	`124`	`+ return nullptr;`
`125`	`125`	`}`
`126`		`- return nullptr;`
	`126`	`+ return &it->second;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`void ItemAttribute::setCustomAttribute(const std::string &key, const int64_t value) {`