diff options
| author | Sooyoung Ha <yoosah.ha@samsung.com> | 2017-09-04 15:03:01 +0900 |
|---|---|---|
| committer | Sooyoung Ha <yoosah.ha@samsung.com> | 2017-09-04 15:03:08 +0900 |
| commit | 1b6ffb29d15afe04391221364e3029ac779126cf (patch) | |
| tree | 05729d6b8ecf7d0f2c0abb9d7f12e7627e27af81 | |
| parent | ff406055ebe0eaf8454d779dd33076965edaa772 (diff) | |
| parent | 63ad44ff3e8f0b9ebefd32767297fc85598752c0 (diff) | |
| download | sdb-1b6ffb29d15afe04391221364e3029ac779126cf.tar.gz sdb-1b6ffb29d15afe04391221364e3029ac779126cf.tar.bz2 sdb-1b6ffb29d15afe04391221364e3029ac779126cf.zip | |
Merge branch 'develop' into tizen_studio_1.3
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
| -rw-r--r-- | package/changelog | 3 | ||||
| -rw-r--r-- | package/pkginfo.manifest | 2 | ||||
| -rwxr-xr-x | src/transport.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/package/changelog b/package/changelog index bdb0043..758180b 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 2.3.6 +- add socket null check on encryption +== Sooyoung Ha <yoosah.ha@samsung.com> 2017-09-04 * 2.3.5 - trivial patch for static analysis == Sooyoung Ha <yoosah.ha@samsung.com> 2017-09-04 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 9853c76..14b1f07 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:2.3.5 +Version:2.3.6 Source:sdb Maintainer: Jaewon Lim <jaewon81.lim@samsung.com>, SangJin Kim <sangjin3.kim@samsung.com> diff --git a/src/transport.c b/src/transport.c index 1911267..202f67f 100755 --- a/src/transport.c +++ b/src/transport.c @@ -995,7 +995,7 @@ void wakeup_select_func(int _fd, unsigned ev, void *data) { } } #ifdef SUPPORT_ENCRYPT - else if(cmd == A_ENCR){ // 암호화 handshaking메시지인 경우 + else if(cmd == A_ENCR && sock != NULL){ // 암호화 handshaking메시지인 경우 PACKET* enc_p = get_apacket(); if(p->msg.arg0 == ENCR_SET_ON_REQ){ // hello 메시지인 경우 if(security_parse_client_hello(t->sessionID, p->data, &(p->msg.data_length)) == 1) // hello 메시지 파싱 |