Bug#1109782: unblock: 7zip/25.00+dfsg-1 (12/13)
From
Bastian Germann@21:1/5 to
All on Wed Jul 23 19:40:02 2025
[continued from previous message]
return pos < 0 ? -1 : (int)startIndex + pos;
}
diff -Nru 7zip-24.09+dfsg/CPP/Common/MyXml.cpp 7zip-25.00+dfsg/CPP/Common/MyXml.cpp
--- 7zip-24.09+dfsg/CPP/Common/MyXml.cpp 2024-01-21 21:00:00.000000000 +0100
+++ 7zip-25.00+dfsg/CPP/Common/MyXml.cpp 2025-06-16 11:00:00.000000000 +0200
@@ -24,7 +24,7 @@
int CXmlItem::FindProp(const char *propName) const throw()
{
FOR_VECTOR (i, Props)
- if (Props[i].Name == propName)
+ if (Props[i].Name.IsEqualTo(propName))
return (int)i;
return -1;
}
@@ -39,7 +39,7 @@
bool CXmlItem::IsTagged(const char *tag) const throw()
{
- return (IsTag && Name == tag);
+ return (IsTag && Name.IsEqualTo(tag));
}
int CXmlItem::FindSubTag(const char *tag) const throw()
diff -Nru 7zip-24.09+dfsg/CPP/Common/Sha3Reg.cpp 7zip-25.00+dfsg/CPP/Common/Sha3Reg.cpp
--- 7zip-24.09+dfsg/CPP/Common/Sha3Reg.cpp 2024-11-26 10:00:00.000000000 +0100
+++ 7zip-25.00+dfsg/CPP/Common/Sha3Reg.cpp 2024-12-01 10:00:00.000000000 +0100
@@ -58,7 +58,7 @@
static IHasher *CreateHasherSpec() \
{ return new CSha3Hasher(digestSize / 8, isShake, \
SHA3_BLOCK_SIZE_FROM_DIGEST_SIZE(d