Add revert if the bytecode length is zero

OpenZeppelin · Mar 11, 2020 · 7a77eb2 · 7a77eb2
1 parent 0449062
commit 7a77eb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/contracts/utils/Create2.sol b/contracts/utils/Create2.sol
@@ -19,6 +19,7 @@ library Create2 {
      */
     function deploy(bytes32 salt, bytes memory bytecode) internal returns (address) {
         address addr;
+        require(bytecode.length != 0, "Create2: bytecode must have a length");
         // solhint-disable-next-line no-inline-assembly
         assembly {
             addr := create2(0, add(bytecode, 0x20), mload(bytecode), salt)

diff --git a/test/utils/Create2.test.js b/test/utils/Create2.test.js
@@ -59,6 +59,11 @@ describe('Create2', function () {
       this.factory.deploy(saltHex, constructorByteCode, { from: deployerAccount }), 'Create2: Failed on deploy'
     );
   });
+  it('should failed deploying a contract in an existent address', async function () {
+    await expectRevert(
+      this.factory.deploy(saltHex, '0x0', { from: deployerAccount }), 'Create2: bytecode must have a length'
+    );
+  });
 });
 
 function computeCreate2Address (saltHex, bytecode, deployer) {