Merge pull request #1350 from ethereum/debugcrash

libs/remix-ui/debugger-ui/src/lib/vm-debugger/solidity-state.tsx

@@ -5,32 +5,36 @@ import { ExtractData } from '../../types' // eslint-disable-line
 
 export const SolidityState = ({ calldata, message }) => {
   const formatSelf = (key: string, data: ExtractData) => {
-    let color = 'var(--primary)'
-    if (data.isArray || data.isStruct || data.isMapping) {
-      color = 'var(--info)'
-    } else if (
-      data.type.indexOf('uint') === 0 ||
+    try {
+      let color = 'var(--primary)'
+      if (data.isArray || data.isStruct || data.isMapping) {
+        color = 'var(--info)'
+      } else if (
+        data.type.indexOf('uint') === 0 ||
             data.type.indexOf('int') === 0 ||
             data.type.indexOf('bool') === 0 ||
             data.type.indexOf('enum') === 0
-    ) {
-      color = 'var(--green)'
-    } else if (data.type === 'string') {
-      color = 'var(--teal)'
+      ) {
+        color = 'var(--green)'
+      } else if (data.type === 'string') {
+        color = 'var(--teal)'
         } else if (data.self == 0x0) { // eslint-disable-line
-      color = 'var(--gray)'
-    }
-    return (
-      <label className='mb-0' style={{ color: data.isProperty ? 'var(--info)' : '', whiteSpace: 'pre-wrap' }}>
-        {' ' + key}:
-        <label className='mb-0' style={{ color }}>
-          {' ' + data.self}
-        </label>
-        <label style={{ fontStyle: 'italic' }}>
-          {data.isProperty || !data.type ? '' : ' ' + data.type}
+        color = 'var(--gray)'
+      }
+      return (
+        <label className='mb-0' style={{ color: data.isProperty ? 'var(--info)' : '', whiteSpace: 'pre-wrap' }}>
+          {' ' + key}:
+          <label className='mb-0' style={{ color }}>
+            {' ' + data.self}
+          </label>
+          <label style={{ fontStyle: 'italic' }}>
+            {data.isProperty || !data.type ? '' : ' ' + data.type}
+          </label>
         </label>
-      </label>
-    )
+      )
+    } catch (e) {
+      return (<></>)
+    }
   }
 
   return (

libs/remix-ui/debugger-ui/src/utils/solidityTypeFormatter.ts

@@ -4,41 +4,45 @@ import { ExtractData } from '../types' // eslint-disable-line
 export function extractData (item, parent): ExtractData {
   const ret: ExtractData = {}
 
-  if (item.isProperty) {
+  if (item.isProperty || !item.type) {
     return item
   }
-  if (item.type.lastIndexOf(']') === item.type.length - 1) {
-    ret.children = (item.value || []).map(function (item, index) {
-      return { key: index, value: item }
-    })
-    ret.children.unshift({
-      key: 'length',
-      value: {
-        self: (new BN(item.length.replace('0x', ''), 16)).toString(10),
-        type: 'uint',
-        isProperty: true
-      }
-    })
-    ret.isArray = true
-    ret.self = parent.isArray ? '' : item.type
-    ret.cursor = item.cursor
-    ret.hasNext = item.hasNext
-  } else if (item.type.indexOf('struct') === 0) {
-    ret.children = Object.keys((item.value || {})).map(function (key) {
-      return { key: key, value: item.value[key] }
-    })
-    ret.self = item.type
-    ret.isStruct = true
-  } else if (item.type.indexOf('mapping') === 0) {
-    ret.children = Object.keys((item.value || {})).map(function (key) {
-      return { key: key, value: item.value[key] }
-    })
-    ret.isMapping = true
-    ret.self = item.type
-  } else {
-    ret.children = null
-    ret.self = item.value
-    ret.type = item.type
+  try {
+    if (item.type.lastIndexOf(']') === item.type.length - 1) {
+      ret.children = (item.value || []).map(function (item, index) {
+        return { key: index, value: item }
+      })
+      ret.children.unshift({
+        key: 'length',
+        value: {
+          self: (new BN(item.length.replace('0x', ''), 16)).toString(10),
+          type: 'uint',
+          isProperty: true
+        }
+      })
+      ret.isArray = true
+      ret.self = parent.isArray ? '' : item.type
+      ret.cursor = item.cursor
+      ret.hasNext = item.hasNext
+    } else if (item.type.indexOf('struct') === 0) {
+      ret.children = Object.keys((item.value || {})).map(function (key) {
+        return { key: key, value: item.value[key] }
+      })
+      ret.self = item.type
+      ret.isStruct = true
+    } else if (item.type.indexOf('mapping') === 0) {
+      ret.children = Object.keys((item.value || {})).map(function (key) {
+        return { key: key, value: item.value[key] }
+      })
+      ret.isMapping = true
+      ret.self = item.type
+    } else {
+      ret.children = null
+      ret.self = item.value
+      ret.type = item.type
+    }
+  } catch (e) {
+    console.log(e)
   }
   return ret
 }