Merge pull request #269 from ethereumjs/fix-helper-memcopy

jochem-brouwer · web-flow · commit ba3e344b5133 · 2020-07-31T16:42:31.000+02:00
Fix large string copies
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - run: npm install
       - run: npm run test
 
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -5,8 +5,8 @@ import * as ethjsUtil from 'ethjs-util'
  * @param {string} input string to check hex prefix of
  */
 export const assertIsHexString = function(input: string): void {
-  const msg = `This method only supports 0x-prefixed hex strings but input was: ${input}`
   if (!ethjsUtil.isHexString(input)) {
+    const msg = `This method only supports 0x-prefixed hex strings but input was: ${input}`
     throw new Error(msg)
   }
 }
@@ -16,8 +16,8 @@ export const assertIsHexString = function(input: string): void {
  * @param {Buffer} input value to check
  */
 export const assertIsBuffer = function(input: Buffer): void {
-  const msg = `This method only supports Buffer but input was: ${input}`
   if (!Buffer.isBuffer(input)) {
+    const msg = `This method only supports Buffer but input was: ${input}`
     throw new Error(msg)
   }
 }
@@ -27,8 +27,8 @@ export const assertIsBuffer = function(input: Buffer): void {
  * @param {number[]} input value to check
  */
 export const assertIsArray = function(input: number[]): void {
-  const msg = `This method only supports number arrays but input was: ${input}`
   if (!Array.isArray(input)) {
+    const msg = `This method only supports number arrays but input was: ${input}`
     throw new Error(msg)
   }
 }
@@ -38,8 +38,8 @@ export const assertIsArray = function(input: number[]): void {
  * @param {string} input value to check
  */
 export const assertIsString = function(input: string): void {
-  const msg = `This method only supports strings but input was: ${input}`
   if (typeof input !== 'string') {
+    const msg = `This method only supports strings but input was: ${input}`
     throw new Error(msg)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import * as ethjsUtil from 'ethjs-util'`
`5`	`5`	`* @param {string} input string to check hex prefix of`
`6`	`6`	`*/`
`7`	`7`	`export const assertIsHexString = function(input: string): void {`
`8`		- const msg = `This method only supports 0x-prefixed hex strings but input was: ${input}`
`9`	`8`	`if (!ethjsUtil.isHexString(input)) {`
	`9`	+ const msg = `This method only supports 0x-prefixed hex strings but input was: ${input}`
`10`	`10`	`throw new Error(msg)`
`11`	`11`	`}`
`12`	`12`	`}`
`@@ -16,8 +16,8 @@ export const assertIsHexString = function(input: string): void {`
`16`	`16`	`* @param {Buffer} input value to check`
`17`	`17`	`*/`
`18`	`18`	`export const assertIsBuffer = function(input: Buffer): void {`
`19`		- const msg = `This method only supports Buffer but input was: ${input}`
`20`	`19`	`if (!Buffer.isBuffer(input)) {`
	`20`	+ const msg = `This method only supports Buffer but input was: ${input}`
`21`	`21`	`throw new Error(msg)`
`22`	`22`	`}`
`23`	`23`	`}`
`@@ -27,8 +27,8 @@ export const assertIsBuffer = function(input: Buffer): void {`
`27`	`27`	`* @param {number[]} input value to check`
`28`	`28`	`*/`
`29`	`29`	`export const assertIsArray = function(input: number[]): void {`
`30`		- const msg = `This method only supports number arrays but input was: ${input}`
`31`	`30`	`if (!Array.isArray(input)) {`
	`31`	+ const msg = `This method only supports number arrays but input was: ${input}`
`32`	`32`	`throw new Error(msg)`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -38,8 +38,8 @@ export const assertIsArray = function(input: number[]): void {`
`38`	`38`	`* @param {string} input value to check`
`39`	`39`	`*/`
`40`	`40`	`export const assertIsString = function(input: string): void {`
`41`		- const msg = `This method only supports strings but input was: ${input}`
`42`	`41`	`if (typeof input !== 'string') {`
	`42`	+ const msg = `This method only supports strings but input was: ${input}`
`43`	`43`	`throw new Error(msg)`
`44`	`44`	`}`
`45`	`45`	`}`