From 31f835adc4d148acdc84f168270c2a01c621c293 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Tue, 16 Sep 2014 12:35:17 -0300 Subject: msgpack-gen: Fix msgpack_rpc_init_function_metadata The function was broken on release builds --- scripts/msgpack-gen.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts/msgpack-gen.lua') diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua index 68faa18c31..e2e0d97ac8 100644 --- a/scripts/msgpack-gen.lua +++ b/scripts/msgpack-gen.lua @@ -126,10 +126,12 @@ void msgpack_rpc_init_function_metadata(Dictionary *metadata) { msgpack_unpacked unpacked; msgpack_unpacked_init(&unpacked); - assert(msgpack_unpack_next(&unpacked, - (const char *)msgpack_metadata, - sizeof(msgpack_metadata), - NULL) == MSGPACK_UNPACK_SUCCESS); + if (msgpack_unpack_next(&unpacked, + (const char *)msgpack_metadata, + sizeof(msgpack_metadata), + NULL) != MSGPACK_UNPACK_SUCCESS) { + abort(); + } Object functions; msgpack_rpc_to_object(&unpacked.data, &functions); msgpack_unpacked_destroy(&unpacked); -- cgit From ddecfb763b01d3d4073cf2c9a5a0035353687ce6 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Tue, 16 Sep 2014 14:12:58 -0300 Subject: deps: Switch lua msgpack library to one that supports 2.0 --- scripts/msgpack-gen.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/msgpack-gen.lua') diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua index e2e0d97ac8..916597afda 100644 --- a/scripts/msgpack-gen.lua +++ b/scripts/msgpack-gen.lua @@ -1,5 +1,5 @@ lpeg = require('lpeg') -msgpack = require('cmsgpack') +msgpack = require('MessagePack') -- lpeg grammar for building api metadata from a set of header files. It -- ignores comments and preprocessor commands and parses a very small subset -- cgit