Skip to content

Commit

Permalink
Do not use format string in PHP extension C++ methods - Fix #2556 (#2615
Browse files Browse the repository at this point in the history 
)
  • Loading branch information
@pepone
pepone authored Aug 5, 2024
1 parent c40b136 commit a7bba0b
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 90 deletions.
11 changes: 6 additions & 5 deletions php/src/Operation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,9 @@ IcePHP::TypedInvocation::prepareRequest(
// Verify that the expected number of arguments are supplied. The context argument is optional.
if (argc != _op->numParams && argc != _op->numParams + 1)
{
runtimeError("incorrect number of parameters (%d)", argc);
ostringstream os;
os << "incorrect number of parameters (" << argc << ")";
runtimeError(os.str());
return false;
}

Expand Down Expand Up @@ -386,10 +388,9 @@ IcePHP::TypedInvocation::prepareRequest(

if ((!info->optional || !isUnset(arg)) && !info->type->validate(arg, false))
{
invalidArgument(
"invalid value for argument %d in operation `%s'",
info->pos + 1,
_op->name.c_str());
ostringstream os;
os << "invalid value for argument " << info->pos + 1 << " in operation '" << _op->name << "'";
invalidArgument(os.str());
return false;
}
}
Expand Down
128 changes: 96 additions & 32 deletions php/src/Types.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
string s = zendTypeToString(Z_TYPE_P(zv));
if (throwException)
{
invalidArgument("expected boolean value but received %s", s.c_str());
ostringstream os;
os << "expected boolean value but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand All @@ -542,7 +544,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
string s = zendTypeToString(Z_TYPE_P(zv));
if (throwException)
{
invalidArgument("expected byte value but received %s", s.c_str());
ostringstream os;
os << "expected byte value but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand All @@ -551,7 +555,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
{
if (throwException)
{
invalidArgument("value %ld is out of range for a byte", val);
ostringstream os;
os << "value " << val << " is out of range for a byte";
invalidArgument(os.str());
}
return false;
}
Expand All @@ -564,7 +570,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
string s = zendTypeToString(Z_TYPE_P(zv));
if (throwException)
{
invalidArgument("expected short value but received %s", s.c_str());
ostringstream os;
os << "expected short value but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand All @@ -573,7 +581,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
{
if (throwException)
{
invalidArgument("value %ld is out of range for a short", val);
ostringstream os;
os << "value " << val << " is out of range for a short";
invalidArgument(os.str());
}
return false;
}
Expand All @@ -586,7 +596,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
string s = zendTypeToString(Z_TYPE_P(zv));
if (throwException)
{
invalidArgument("expected int value but received %s", s.c_str());
ostringstream os;
os << "expected int value but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand All @@ -595,7 +607,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
{
if (throwException)
{
invalidArgument("value %ld is out of range for an int", val);
ostringstream os;
os << "value " << val << " is out of range for an int";
invalidArgument(os.str());
}
return false;
}
Expand All @@ -609,7 +623,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
string s = zendTypeToString(Z_TYPE_P(zv));
if (throwException)
{
invalidArgument("expected long value but received %s", s.c_str());
ostringstream os;
os << "expected long value but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand All @@ -625,7 +641,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
{
if (throwException)
{
invalidArgument("invalid long value `%s'", Z_STRVAL_P(zv));
ostringstream os;
os << "invalid long value `" << sval << "'";
invalidArgument(os.str());
}
return false;
}
Expand All @@ -639,7 +657,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
string s = zendTypeToString(Z_TYPE_P(zv));
if (throwException)
{
invalidArgument("expected float value but received %s", s.c_str());
ostringstream os;
os << "expected float value but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand All @@ -657,7 +677,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
string s = zendTypeToString(Z_TYPE_P(zv));
if (throwException)
{
invalidArgument("expected double value but received %s", s.c_str());
ostringstream os;
os << "expected double value but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand All @@ -670,7 +692,9 @@ IcePHP::PrimitiveInfo::validate(zval* zv, bool throwException)
string s = zendTypeToString(Z_TYPE_P(zv));
if (throwException)
{
invalidArgument("expected string value but received %s", s.c_str());
ostringstream os;
os << "expected string value but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand Down Expand Up @@ -1037,7 +1061,9 @@ IcePHP::EnumInfo::unmarshal(

if (enumerators.find(val) == enumerators.end())
{
invalidArgument("enumerator %d is out of range for enum %s", val, id.c_str());
ostringstream os;
os << "enumerator " << val << " is out of range for enum " << id;
invalidArgument(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -1181,7 +1207,9 @@ IcePHP::StructInfo::validate(zval* zv, bool throwException)
if (throwException)
{
string s = zendTypeToString(Z_TYPE_P(zv));
invalidArgument("expected struct value of type %s but received %s", zce->name->val, s.c_str());
ostringstream os;
os << "expected struct value of type " << zce->name->val << " but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand All @@ -1190,7 +1218,9 @@ IcePHP::StructInfo::validate(zval* zv, bool throwException)
zend_class_entry* ce = Z_OBJCE_P(zv);
if (ce != zce)
{
invalidArgument("expected struct value of type %s but received %s", zce->name->val, ce->name->val);
ostringstream os;
os << "expected struct value of type " << zce->name->val << " but received " << ce->name->val;
invalidArgument(os.str());
return false;
}

Expand Down Expand Up @@ -1239,7 +1269,9 @@ IcePHP::StructInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMa
{
if (object_init_ex(&_nullMarshalValue, const_cast<zend_class_entry*>(zce)) != SUCCESS)
{
runtimeError("unable to initialize object of type %s", zce->name->val);
ostringstream os;
os << "unable to initialize object of type " << zce->name->val;
runtimeError(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -1270,7 +1302,9 @@ IcePHP::StructInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMa
zval* val = zend_hash_str_find(Z_OBJPROP_P(zv), member->name.c_str(), member->name.size());
if (!val)
{
runtimeError("member `%s' of %s is not defined", member->name.c_str(), id.c_str());
ostringstream os;
os << "member '" << member->name << "' of " << id << " is not defined";
runtimeError(os.str());
throw AbortMarshaling();
}

Expand All @@ -1281,7 +1315,9 @@ IcePHP::StructInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMa

if (!member->type->validate(val, false))
{
invalidArgument("invalid value for %s member `%s'", id.c_str(), member->name.c_str());
ostringstream os;
os << "invalid value for " << id << " member '" << member->name << "'";
invalidArgument(os.str());
throw AbortMarshaling();
}

Expand All @@ -1307,7 +1343,9 @@ IcePHP::StructInfo::unmarshal(
AutoDestroy destroy(&zv);
if (object_init_ex(&zv, const_cast<zend_class_entry*>(zce)) != SUCCESS)
{
runtimeError("unable to initialize object of type %s", zce->name->val);
ostringstream os;
os << "unable to initialize object of type " << zce->name->val;
runtimeError(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -1467,7 +1505,9 @@ IcePHP::SequenceInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* object
{
if (!elementType->validate(val, false))
{
invalidArgument("invalid value for sequence element `%s'", id.c_str());
ostringstream os;
os << "invalid value for sequence element '" << id << "'";
invalidArgument(os.str());
throw AbortMarshaling();
}
elementType->marshal(val, os, objectMap, false);
Expand Down Expand Up @@ -1997,7 +2037,9 @@ IcePHP::DictionaryInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* obje
auto enKey = dynamic_pointer_cast<EnumInfo>(keyType);
if (!enKey && (!piKey || piKey->kind == PrimitiveInfo::KindFloat || piKey->kind == PrimitiveInfo::KindDouble))
{
invalidArgument("dictionary type `%s' cannot be marshaled", id.c_str());
ostringstream os;
os << "dictionary type '" << id << "' cannot be marshaled";
invalidArgument(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -2072,15 +2114,19 @@ IcePHP::DictionaryInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* obje
// Marshal the key.
if (!keyType->validate(&zkey, false))
{
invalidArgument("invalid key in `%s' element", id.c_str());
ostringstream os;
os << "invalid key in '" << id << "' element";
invalidArgument(os.str());
throw AbortMarshaling();
}
keyType->marshal(&zkey, os, objectMap, false);

// Marshal the value.
if (!valueType->validate(val, false))
{
invalidArgument("invalid value in `%s' element", id.c_str());
ostringstream os;
os << "invalid value in '" << id << "' element";
invalidArgument(os.str());
throw AbortMarshaling();
}
valueType->marshal(val, os, objectMap, false);
Expand Down Expand Up @@ -2119,7 +2165,9 @@ IcePHP::DictionaryInfo::unmarshal(
auto enKey = dynamic_pointer_cast<EnumInfo>(keyType);
if (!enKey && (!piKey || piKey->kind == PrimitiveInfo::KindFloat || piKey->kind == PrimitiveInfo::KindDouble))
{
invalidArgument("dictionary type `%s' cannot be unmarshaled", id.c_str());
ostringstream os;
os << "dictionary type '" << id << "' cannot be unmarshaled";
invalidArgument(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -2336,7 +2384,9 @@ IcePHP::ClassInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMap
{
if (!defined)
{
runtimeError("class %s is declared but not defined", id.c_str());
ostringstream os;
os << "class " << id << " is declared but not defined";
runtimeError(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -2392,7 +2442,9 @@ IcePHP::ClassInfo::unmarshal(
{
if (!defined)
{
runtimeError("class or interface %s is declared but not defined", id.c_str());
ostringstream os;
os << "class or interface " << id << " is declared but not defined";
runtimeError(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -2559,7 +2611,9 @@ IcePHP::ProxyInfo::validate(zval* zv, bool throwException)
if (throwException)
{
string s = zendTypeToString(Z_TYPE_P(zv));
invalidArgument("expected proxy value or null but received %s", s.c_str());
ostringstream os;
os << "expected proxy value or null but received " << s;
invalidArgument(os.str());
}
return false;
}
Expand Down Expand Up @@ -2610,7 +2664,9 @@ IcePHP::ProxyInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap*, bool opt
}
if (!info->isA(id))
{
invalidArgument("proxy is not narrowed to %s", id.c_str());
ostringstream os;
os << "proxy is not narrowed to " << id;
invalidArgument(os.str());
throw AbortMarshaling();
}
os->write(proxy);
Expand Down Expand Up @@ -2651,7 +2707,9 @@ IcePHP::ProxyInfo::unmarshal(

if (!defined)
{
runtimeError("proxy %s is declared but not defined", id.c_str());
ostringstream os;
os << "proxy " << id << " is declared but not defined";
runtimeError(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -2884,7 +2942,9 @@ IcePHP::ValueWriter::writeMembers(Ice::OutputStream* os, const DataMemberList& m

if (!val)
{
runtimeError("member `%s' of %s is not defined", member->name.c_str(), _info->id.c_str());
ostringstream os;
os << "member '" << member->name << "' of " << _info->id << " is not defined";
runtimeError(os.str());
throw AbortMarshaling();
}

Expand All @@ -2903,7 +2963,9 @@ IcePHP::ValueWriter::writeMembers(Ice::OutputStream* os, const DataMemberList& m

if (!member->type->validate(val, false))
{
invalidArgument("invalid value for %s member `%s'", _info->id.c_str(), member->name.c_str());
ostringstream os;
os << "invalid value for " << _info->id << " member '" << member->name << "'";
invalidArgument(os.str());
throw AbortMarshaling();
}

Expand Down Expand Up @@ -3085,7 +3147,9 @@ IcePHP::ExceptionInfo::unmarshal(Ice::InputStream* is, const CommunicatorInfoPtr
{
if (object_init_ex(zv, zce) != SUCCESS)
{
runtimeError("unable to initialize object of type %s", zce->name->val);
ostringstream os;
os << "unable to initialize object of type " << zce->name->val;
runtimeError(os.str());
throw AbortMarshaling();
}

Expand Down
Loading

0 comments on commit a7bba0b

Please sign in to comment.