Commit c8583472 authored by tongkunkun's avatar tongkunkun Committed by Tomasz Zawadzki
Browse files

json: fix wrong param in json_parse_ut.c calling function 'spdk_json_parse' 



the sizeof(g_vals) should be the num of array, not the num of bytes. see follow:

CU_ASSERT(spdk_json_parse(g_buf, sizeof(in) - 1, g_vals, sizeof(g_vals), &g_end, flags | SPDK_JSON_PARSE_FLAG_DECODE_IN_PLACE) == num_vals);

Fixes #2623

Signed-off-by: default avatartongkunkun <tongkunkun_yewu@cmss.chinamobile.com>
Change-Id: I3b7994606284fe3464650337ecb0f723a627f7aa
Reported-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13841


Reviewed-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a02483e6

test/unit/lib/json/json_parse.c/json_parse_ut.c

+4 −2
Original line number Diff line number Diff line
@@ -9,9 +9,11 @@ 


#include "json/json_parse.c"



#define JSONVALUE_NUM 100



static uint8_t g_buf[1000];

static void *g_end;

static struct spdk_json_val g_vals[100];

static struct spdk_json_val g_vals[JSONVALUE_NUM];

static int g_cur_val;



/* Fill buf with raw data */
@@ -30,7 +32,7 @@ static int g_cur_val; 
	BUF_SETUP(in); \

	CU_ASSERT(spdk_json_parse(g_buf, sizeof(in) - 1, NULL, 0, &g_end, flags) == num_vals); \

	memset(g_vals, 0, sizeof(g_vals)); \

	CU_ASSERT(spdk_json_parse(g_buf, sizeof(in) - 1, g_vals, sizeof(g_vals), &g_end, flags | SPDK_JSON_PARSE_FLAG_DECODE_IN_PLACE) == num_vals); \

	CU_ASSERT(spdk_json_parse(g_buf, sizeof(in) - 1, g_vals, JSONVALUE_NUM, &g_end, flags | SPDK_JSON_PARSE_FLAG_DECODE_IN_PLACE) == num_vals); \

	CU_ASSERT(g_end == g_buf + sizeof(in) - sizeof(trailing)); \

	CU_ASSERT(memcmp(g_end, trailing, sizeof(trailing) - 1) == 0); \

	g_cur_val = 0