Merge pull request EOSIO#37 from EOSIO/release/1.1.x

Release/1.1.x

CMakeLists.txt

@@ -3,7 +3,7 @@ project(eosio_wasm_sdk)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 1)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 
 if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
    message(WARNING "CMAKE_INSTALL_PREFIX is set to default path of ${CMAKE_INSTALL_PREFIX}, resetting to ${CMAKE_INSTALL_PREFIX}/eosio.wasmsdk")

README.md

@@ -1,5 +1,5 @@
 # WasmSDK
-## Version : 1.1.0
+## Version : 1.1.1
 
 WasmSDK is a toolchain for WebAssembly (WASM).  In addition to being a general purpose WebAssembly toolchain, [EOSIO](https://github.com/eosio/eos) specific optimizations are available to support building EOSIO smart contracts.  This new toolchain is built around [Clang 7](https://github.com/eosio/llvm), which means that the SDK has the most currently available optimizations and analyses from LLVM, but as the WASM target is still considered experimental, some optimizations are not available or incomplete.
 

libraries/eosiolib/asset.hpp

@@ -173,10 +173,10 @@ namespace eosio {
        * @post The amount of this asset is multiplied by a
        */
       asset& operator*=( int64_t a ) {
-         eosio_assert( a == 0 || (amount * a) / a == amount, "multiplication overflow or underflow" );
-         amount *= a;
-         eosio_assert( -max_amount <= amount, "multiplication underflow" );
-         eosio_assert( amount <= max_amount,  "multiplication overflow" );
+         int128_t tmp = (int128_t)amount * (int128_t)a;
+         eosio_assert( tmp <= max_amount, "multiplication overflow" );
+         eosio_assert( tmp >= -max_amount, "multiplication underflow" );
+         amount = (int64_t)tmp;
          return *this;
       }
 
@@ -218,6 +218,8 @@ namespace eosio {
        * @post The amount of this asset is divided by a
        */
       asset& operator/=( int64_t a ) {
+         eosio_assert( a != 0, "divide by zero" );
+         eosio_assert( !(amount == std::numeric_limits<int64_t>::min() && a == -1), "signed division overflow" );
          amount /= a;
          return *this;
       }
@@ -246,6 +248,7 @@ namespace eosio {
        * @pre Both asset must have the same symbol
        */
       friend int64_t operator/( const asset& a, const asset& b ) {
+         eosio_assert( b.amount != 0, "divide by zero" );
          eosio_assert( a.symbol == b.symbol, "comparison of assets with different symbols is not allowed" );
          return a.amount / b.amount;
       }

libraries/eosiolib/crypto.h

@@ -42,7 +42,7 @@ extern "C" {
  *  eosio::print("sha256 hash generated from data equals provided hash");
  *  @endcode
  */
-void assert_sha256( char* data, uint32_t length, const checksum256* hash );
+void assert_sha256( const char* data, uint32_t length, const checksum256* hash );
 
 /**
  *  Tests if the sha1 hash generated from data matches the provided checksum.
@@ -67,7 +67,7 @@ void assert_sha256( char* data, uint32_t length, const checksum256* hash );
  *  eosio::print("sha1 hash generated from data equals provided hash");
  *  @endcode
  */
-void assert_sha1( char* data, uint32_t length, const checksum160* hash );
+void assert_sha1( const char* data, uint32_t length, const checksum160* hash );
 
 /**
  *  Tests if the sha512 hash generated from data matches the provided checksum.
@@ -92,7 +92,7 @@ void assert_sha1( char* data, uint32_t length, const checksum160* hash );
  *  eosio::print("sha512 hash generated from data equals provided hash");
  *  @endcode
  */
-void assert_sha512( char* data, uint32_t length, const checksum512* hash );
+void assert_sha512( const char* data, uint32_t length, const checksum512* hash );
 
 /**
  *  Tests if the ripemod160 hash generated from data matches the provided checksum.
@@ -116,7 +116,7 @@ void assert_sha512( char* data, uint32_t length, const checksum512* hash );
  *  eosio::print("ripemod160 hash generated from data equals provided hash");
  *  @endcode
  */
-void assert_ripemd160( char* data, uint32_t length, const checksum160* hash );
+void assert_ripemd160( const char* data, uint32_t length, const checksum160* hash );
 
 /**
  *  Hashes `data` using `sha256` and stores result in memory pointed to by hash.
@@ -134,7 +134,7 @@ void assert_ripemd160( char* data, uint32_t length, const checksum160* hash );
  *  eos_assert( calc_hash == hash, "invalid hash" );
  *  @endcode
  */
-void sha256( char* data, uint32_t length, checksum256* hash );
+void sha256( const char* data, uint32_t length, checksum256* hash );
 
 /**
  *  Hashes `data` using `sha1` and stores result in memory pointed to by hash.
@@ -152,7 +152,7 @@ void sha256( char* data, uint32_t length, checksum256* hash );
  *  eos_assert( calc_hash == hash, "invalid hash" );
  *  @endcode
  */
-void sha1( char* data, uint32_t length, checksum160* hash );
+void sha1( const char* data, uint32_t length, checksum160* hash );
 
 /**
  *  Hashes `data` using `sha512` and stores result in memory pointed to by hash.
@@ -170,7 +170,7 @@ void sha1( char* data, uint32_t length, checksum160* hash );
  *  eos_assert( calc_hash == hash, "invalid hash" );
  *  @endcode
  */
-void sha512( char* data, uint32_t length, checksum512* hash );
+void sha512( const char* data, uint32_t length, checksum512* hash );
 
 /**
  *  Hashes `data` using `ripemod160` and stores result in memory pointed to by hash.
@@ -188,7 +188,7 @@ void sha512( char* data, uint32_t length, checksum512* hash );
  *  eos_assert( calc_hash == hash, "invalid hash" );
  *  @endcode
  */
-void ripemd160( char* data, uint32_t length, checksum160* hash );
+void ripemd160( const char* data, uint32_t length, checksum160* hash );
 
 /**
  *  Calculates the public key used for a given signature and hash used to create a message.