fixup! bad(Swingset): Releasing a constrained Zalgo on syscall replay

Address feedback: better isThenable check
Agoric · Jan 12, 2023 · 3de2ea5 · 3de2ea5
1 parent 89ef9af
commit 3de2ea5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/SwingSet/src/kernel/vat-loader/async-helper.js b/packages/SwingSet/src/kernel/vat-loader/async-helper.js
@@ -19,7 +19,7 @@
  * @returns {T extends PromiseLike<any> ? Promise<Awaited<R>> : R}
  */
 export function maybeAsync(v, handle) {
-  if (typeof v === 'object' && v !== null && 'then' in v) {
+  if (Object(v) === v && typeof v.then === 'function') {
     return Promise.resolve(v).then(handle);
   } else {
     return handle(v);
@@ -37,7 +37,7 @@ export function ensureSync(fn) {
   // eslint-disable-next-line func-names
   return function (...args) {
     const result = Reflect.apply(fn, this, args);
-    if (typeof result === 'object' && result !== null && 'then' in result) {
+    if (Object(result) === result && typeof result.then === 'function') {
       throw new Error('Unexpected async result');
     } else {
       return result;