提交 c97e4f14 编写于 作者: S Shengliang Guan

fix crash while pconn is null

上级 29cc962f
...@@ -50,7 +50,7 @@ int32_t mqttInitSystem() { ...@@ -50,7 +50,7 @@ int32_t mqttInitSystem() {
recntStatus.password = strstr(url, "@") != NULL ? strbetween(strstr(url, recntStatus.user_name), ":", "@") : NULL; recntStatus.password = strstr(url, "@") != NULL ? strbetween(strstr(url, recntStatus.user_name), ":", "@") : NULL;
if (strlen(url) == 0) { if (strlen(url) == 0) {
mqttError("failed to initialize mqtt module, reason: url is null"); mqttTrace("mqtt module not init, url is null");
return rc; return rc;
} }
......
...@@ -680,13 +680,13 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) { ...@@ -680,13 +680,13 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) {
} }
if (pConn) { if (pConn) {
pConn->tretry = 0;
pConn->ahandle = pContext->ahandle; pConn->ahandle = pContext->ahandle;
sprintf(pConn->info, "%s %p %p", pRpc->label, pConn, pConn->ahandle); sprintf(pConn->info, "%s %p %p", pRpc->label, pConn, pConn->ahandle);
} else { } else {
tError("%s %p, failed to set up connection(%s)", pRpc->label, pContext->ahandle, tstrerror(terrno)); tError("%s %p, failed to set up connection(%s)", pRpc->label, pContext->ahandle, tstrerror(terrno));
} }
pConn->tretry = 0;
return pConn; return pConn;
} }
......
...@@ -147,7 +147,7 @@ print =============== step3 - db ...@@ -147,7 +147,7 @@ print =============== step3 - db
system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d ' select * from d1.t1;' 127.0.0.1:6020/rest/sql system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d ' select * from d1.t1;' 127.0.0.1:6020/rest/sql
print 21-> $system_content print 21-> $system_content
if $system_content != @{"status":"error","code":1000,"desc":"invalid table name"}@ then if $system_content != @{"status":"error","code":1000,"desc":"invalid table id"}@ then
return -1 return -1
endi endi
......
...@@ -59,7 +59,6 @@ cd ../../../debug; make ...@@ -59,7 +59,6 @@ cd ../../../debug; make
./test.sh -f general/db/delete_writing1.sim ./test.sh -f general/db/delete_writing1.sim
./test.sh -f general/db/delete_writing2.sim ./test.sh -f general/db/delete_writing2.sim
./test.sh -f general/db/delete.sim ./test.sh -f general/db/delete.sim
#not test ./test.sh -f general/db/dropdnodes.sim
./test.sh -f general/db/len.sim ./test.sh -f general/db/len.sim
./test.sh -f general/db/repeat.sim ./test.sh -f general/db/repeat.sim
./test.sh -f general/db/tables.sim ./test.sh -f general/db/tables.sim
...@@ -121,7 +120,7 @@ cd ../../../debug; make ...@@ -121,7 +120,7 @@ cd ../../../debug; make
# ./test.sh -f general/parser/import_file.sim # ./test.sh -f general/parser/import_file.sim
./test.sh -f general/parser/lastrow.sim ./test.sh -f general/parser/lastrow.sim
./test.sh -f general/parser/nchar.sim ./test.sh -f general/parser/nchar.sim
./test.sh -f general/parser/null_char.sim #unsupport ./test.sh -f general/parser/null_char.sim
./test.sh -f general/parser/single_row_in_tb.sim ./test.sh -f general/parser/single_row_in_tb.sim
./test.sh -f general/parser/select_from_cache_disk.sim ./test.sh -f general/parser/select_from_cache_disk.sim
./test.sh -f general/parser/limit.sim ./test.sh -f general/parser/limit.sim
...@@ -214,7 +213,6 @@ cd ../../../debug; make ...@@ -214,7 +213,6 @@ cd ../../../debug; make
./test.sh -f general/tag/tinyint.sim ./test.sh -f general/tag/tinyint.sim
./test.sh -f general/user/authority.sim ./test.sh -f general/user/authority.sim
./test.sh -f general/user/basic1.sim
./test.sh -f general/user/monitor.sim ./test.sh -f general/user/monitor.sim
./test.sh -f general/user/pass_alter.sim ./test.sh -f general/user/pass_alter.sim
./test.sh -f general/user/pass_len.sim ./test.sh -f general/user/pass_len.sim
......
cd ../../debug; cmake ..
cd ../../debug; make
./test.sh -f general/db/dropdnodes.sim
./test.sh -f general/user/basic1.sim
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册