Przeglądaj źródła

arm_interface: curb infinite recursion in stacktrace generation

Liam 3 lat temu
rodzic
commit
3e6840a74c

+ 1 - 1
src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -450,7 +450,7 @@ std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_32::GetBacktrace(Core::S
     // Frame records are two words long:
     // Frame records are two words long:
     // fp+0 : pointer to previous frame record
     // fp+0 : pointer to previous frame record
     // fp+4 : value of lr for frame
     // fp+4 : value of lr for frame
-    while (true) {
+    for (size_t i = 0; i < 256; i++) {
         out.push_back({"", 0, lr, 0, ""});
         out.push_back({"", 0, lr, 0, ""});
         if (!fp || (fp % 4 != 0) || !memory.IsValidVirtualAddressRange(fp, 8)) {
         if (!fp || (fp % 4 != 0) || !memory.IsValidVirtualAddressRange(fp, 8)) {
             break;
             break;

+ 1 - 1
src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -517,7 +517,7 @@ std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_64::GetBacktrace(Core::S
     // Frame records are two words long:
     // Frame records are two words long:
     // fp+0 : pointer to previous frame record
     // fp+0 : pointer to previous frame record
     // fp+8 : value of lr for frame
     // fp+8 : value of lr for frame
-    while (true) {
+    for (size_t i = 0; i < 256; i++) {
         out.push_back({"", 0, lr, 0, ""});
         out.push_back({"", 0, lr, 0, ""});
         if (!fp || (fp % 4 != 0) || !memory.IsValidVirtualAddressRange(fp, 16)) {
         if (!fp || (fp % 4 != 0) || !memory.IsValidVirtualAddressRange(fp, 16)) {
             break;
             break;