If evaluate request fails, ignore variable

eclipse-theia · Nov 29, 2022 · dd96271 · dd96271
1 parent 32deea2
commit dd96271
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/packages/memory-inspector/src/browser/memory-provider/cdt-gdb-memory-provider.ts b/packages/memory-inspector/src/browser/memory-provider/cdt-gdb-memory-provider.ts
@@ -64,22 +64,21 @@ export class CDTGDBMemoryProvider extends AbstractMemoryProvider {
                         expression: addrExp,
                         context: 'watch',
                         frameId: frame.raw.id,
-                    });
+                    }).catch(e => { console.warn(`Failed to evaluate ${addrExp}. Corresponding variable will be omitted from Memory Inspector display.`, e); });
+                    if (!addrResp) { continue; }
+
                     const sizeResp = await session.sendRequest('evaluate', {
                         expression: sizeExp,
                         context: 'watch',
                         frameId: frame.raw.id,
-                    });
+                    }).catch(e => { console.warn(`Failed to evaluate ${sizeExp}. Corresponding variable will be omitted from Memory Inspector display.`, e); });
+                    if (!sizeResp) { continue; }
 
                     // Make sure the address is in the format we expect.
                     const addressPart = /0x[0-9a-f]+/i.exec(addrResp.body.result);
-                    if (!addressPart) {
-                        continue;
-                    }
+                    if (!addressPart) { continue; }
 
-                    if (!/^[0-9]+$/.test(sizeResp.body.result)) {
-                        continue;
-                    }
+                    if (!/^[0-9]+$/.test(sizeResp.body.result)) { continue; }
 
                     const size = parseInt(sizeResp.body.result);
                     const address = hexStrToUnsignedLong(addressPart[0]);