{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752654809, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"ef6e2de39108c006a6663e29dcf93fa6", "commit": {"type":"commit", "time": 1508700680, "time_ofs": 120, "oid_tree": { "oid": "38de7282c2c67a1b5f87debcb73c325e47121df7", "alias": []}, "oid":{ "oid": "f84a648ca1da0177e7ed1d4b50312c5dd6a2c0c8", "alias": []}, "msg": "apps/s_client.c: add missing null check apps/s_server.c: remove unnecessary null check", "sig_commit": { "git_time": { "time": 1508700680, "offset": 120 }, "name": "Andy Polyakov", "email": "appro@openssl.org", "md5": "50bd64fa2a792cbbf679fa16213a3b2a" }, "sig_author": { "git_time": { "time": 1508424063, "offset": 540 }, "name": "KaoruToda", "email": "kunnpuu@gmail.com", "md5": "95a34ee46213b3842a23a71997fe258a" }}, "body": "apps/s_client.c: add missing null check\napps/s_server.c: remove unnecessary null check\n\nReviewed-by: Rich Salz \u003crsalz@openssl.org\u003e\nReviewed-by: Andy Polyakov \u003cappro@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/4558)\n" , "diff": "diff --git a/apps/s_client.c b/apps/s_client.c\nindex 96bfc15..019e735 100644\n--- a/apps/s_client.c\n+++ b/apps/s_client.c\n@@ -1866,6 +1866,9 @@ int s_client_main(int argc, char **argv)\n goto end;\n \n con \u003d SSL_new(ctx);\n+ if (con \u003d\u003d NULL)\n+ goto end;\n+\n if (sess_in !\u003d NULL) {\n SSL_SESSION *sess;\n BIO *stmp \u003d BIO_new_file(sess_in, \u0022r\u0022);\ndiff --git a/apps/s_server.c b/apps/s_server.c\nindex a7d85f3..311f4a2 100644\n--- a/apps/s_server.c\n+++ b/apps/s_server.c\n@@ -2202,22 +2202,25 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)\n BIO_printf(bio_err, \u0022Turned on non blocking io\u005cn\u0022);\n }\n \n+ con \u003d SSL_new(ctx);\n if (con \u003d\u003d NULL) {\n- con \u003d SSL_new(ctx);\n+ ret \u003d -1;\n+ goto err;\n+ }\n \n- if (s_tlsextdebug) {\n- SSL_set_tlsext_debug_callback(con, tlsext_cb);\n- SSL_set_tlsext_debug_arg(con, bio_s_out);\n- }\n+ if (s_tlsextdebug) {\n+ SSL_set_tlsext_debug_callback(con, tlsext_cb);\n+ SSL_set_tlsext_debug_arg(con, bio_s_out);\n+ }\n \n- if (context\n- \u0026\u0026 !SSL_set_session_id_context(con,\n- context, strlen((char *)context))) {\n- BIO_printf(bio_err, \u0022Error setting session id context\u005cn\u0022);\n- ret \u003d -1;\n- goto err;\n- }\n+ if (context !\u003d NULL\n+ \u0026\u0026 !SSL_set_session_id_context(con, context,\n+ strlen((char *)context))) {\n+ BIO_printf(bio_err, \u0022Error setting session id context\u005cn\u0022);\n+ ret \u003d -1;\n+ goto err;\n }\n+\n if (!SSL_clear(con)) {\n BIO_printf(bio_err, \u0022Error clearing SSL connection\u005cn\u0022);\n ret \u003d -1;\n","s":{"c":1752654809,"u": 44879}} ],"g": 45771,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}