Mirror-bot/AnyPS5
1
0 Fork 0
mirror of https://github.com/boykopovar/AnyPS5.git synced 2026-10-28 00:35:47 +00:00
Code Issues Projects Releases Activity

Merge pull request #7977 from Ondra97/codex/fix-json2-type-allocation

Browse Source 
fix(json2): preserve values when type allocation fails
This commit is contained in:
Dean authored and GitHub committed 2026-10-20 17:55:19 +13:00
2 parents 329b9aa1a7 51e75dec25
commit a4960cb378
2 files changed
+23 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/libs/prx/libSceJson2/Export.cpp
+8 -5
View File
@@ -196,12 +196,15 @@ void CopyInto(Value& destination, const Value& source) {
}
void SetType(Node& n, ValueType type) {
Clear(n);
n.type = type;
if (type == TypeString) Construct(n.string, std::string());
if (type == TypeArray) Construct(n.array);
if (type == TypeObject) Construct(n.object);
if (type < TypeNull || type > TypeObject) throw std::invalid_argument("sce::Json::Value::set: invalid value type");
Node pending{};
pending.type = type;
if (type == TypeString) Construct(pending.string, std::string());
if (type == TypeArray) Construct(pending.array);
if (type == TypeObject) Construct(pending.object);
Clear(n);
pending.handlers = n.handlers;
n = pending;
}
const Value& Defaults(ValueType type) {
core/libs/tests/JsonCopyFailure.cpp
+15 -3
View File
@@ -24,6 +24,8 @@ void APS5_VABI _ZN3sce4Json5ValueD1Ev(Value*);
Value* APS5_VABI _ZN3sce4Json5ValueaSERKS1_(Value*, const Value*);
int APS5_VABI _ZN3sce4Json5Value3setERKNS0_5ArrayE(Value*, const Array*);
int APS5_VABI _ZN3sce4Json5Value3setERKNS0_6ObjectE(Value*, const Object*);
int APS5_VABI _ZN3sce4Json5Value3setENS0_9ValueTypeE(Value*, std::int32_t);
std::int32_t APS5_VABI _ZNK3sce4Json5Value7getTypeEv(const Value*);
const Array* APS5_VABI _ZNK3sce4Json5Value8getArrayEv(const Value*);
const Object* APS5_VABI _ZNK3sce4Json5Value9getObjectEv(const Value*);
int APS5_VABI _ZN3sce4Json5Value9serializeERNS0_6StringE(Value*, String*);
@@ -92,7 +94,7 @@ static void CheckValue(const Value& value, const char* expected) {
enum class Operation {
ValueCopy, ArrayCopy, ObjectCopy, ValueAssign, ObjectAssign, ArrayAppend,
ValueArray, ValueObject, ValueString, ValueText, ValueTypeString, ValueTypeArray,
ValueTypeObject, SetArray, SetObject, PairCopy
ValueTypeObject, SetArray, SetObject, SetTypeArray, SetTypeObject, SetTypeString, PairCopy
};
static bool Run(Operation operation, const Value& source, const char* expected, const Array& array, const Object& object, const String& text) {
@@ -101,7 +103,8 @@ static bool Run(Operation operation, const Value& source, const char* expected,
Object objectResult{};
Pair pair{};
bool valueReady = false, arrayReady = false, objectReady = false, pairReady = false;
if (operation == Operation::ValueAssign || operation == Operation::SetArray || operation == Operation::SetObject) {
const bool typeSetter = operation == Operation::SetTypeArray || operation == Operation::SetTypeObject || operation == Operation::SetTypeString;
if (operation == Operation::ValueAssign || operation == Operation::SetArray || operation == Operation::SetObject || typeSetter) {
_ZN3sce4Json5ValueC1EPKc(&result, "previous");
valueReady = true;
}
@@ -126,6 +129,9 @@ static bool Run(Operation operation, const Value& source, const char* expected,
case Operation::ValueTypeObject: _ZN3sce4Json5ValueC1ENS0_9ValueTypeE(&result, 7); valueReady = true; break;
case Operation::SetArray: _ZN3sce4Json5Value3setERKNS0_5ArrayE(&result, &array); break;
case Operation::SetObject: _ZN3sce4Json5Value3setERKNS0_6ObjectE(&result, &object); break;
case Operation::SetTypeArray: _ZN3sce4Json5Value3setENS0_9ValueTypeE(&result, 6); break;
case Operation::SetTypeObject: _ZN3sce4Json5Value3setENS0_9ValueTypeE(&result, 7); break;
case Operation::SetTypeString: _ZN3sce4Json5Value3setENS0_9ValueTypeE(&result, 5); break;
case Operation::PairCopy: _ZN3sce4Json6Object4PairC1ERKNS0_6StringERKNS0_5ValueE(&pair, &text, &source); pairReady = true; break;
}
succeeded = true;
@@ -134,7 +140,10 @@ static bool Run(Operation operation, const Value& source, const char* expected,
allocationBudget = -1;
if (valueReady) {
if (succeeded) CheckValue(result, expected);
else CheckValue(result, "\"previous\"");
else {
Require(_ZNK3sce4Json5Value7getTypeEv(&result) == 5, "failed setter changed the destination type");
CheckValue(result, "\"previous\"");
}
_ZN3sce4Json5ValueD1Ev(&result);
}
if (arrayReady) {
@@ -183,6 +192,9 @@ int main() {
{"empty object value", Operation::ValueTypeObject, &objectValue, "{}"},
{"set array", Operation::SetArray, &arrayValue, arrayJson},
{"set object", Operation::SetObject, &objectValue, objectJson},
{"set empty array", Operation::SetTypeArray, &objectValue, "[]"},
{"set empty object", Operation::SetTypeObject, &objectValue, "{}"},
{"set empty string", Operation::SetTypeString, &objectValue, "\"\""},
{"pair copy", Operation::PairCopy, &objectValue, objectJson},
};
unsigned failures = 0;