Skip to content

Fix potential memory leak #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix potential memory leak #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions patches/nginx.1.14.0.ssl.extensions.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -Naurp nginx-1.14.0.orig/src/event/ngx_event_openssl.c nginx-1.14.0/src/event/ngx_event_openssl.c
--- nginx-1.14.0.orig/src/event/ngx_event_openssl.c 2018-04-17 18:22:36.000000000 +0300
+++ nginx-1.14.0/src/event/ngx_event_openssl.c 2020-10-26 21:08:09.110961786 +0300
--- nginx-1.14.0.orig/src/event/ngx_event_openssl.c 2022-07-26 12:37:49.136566490 +0430
+++ nginx-1.14.0/src/event/ngx_event_openssl.c 2022-07-26 12:38:20.926566041 +0430
@@ -1220,6 +1220,107 @@ ngx_ssl_set_session(ngx_connection_t *c,
return NGX_OK;
}
Expand Down Expand Up @@ -97,8 +97,8 @@ diff -Naurp nginx-1.14.0.orig/src/event/ngx_event_openssl.c nginx-1.14.0/src/eve
+ if (c->ssl->extensions != NULL) {
+ c->ssl->extensions_size = ext_len;
+ ngx_memcpy(c->ssl->extensions, ext_out, sizeof(int) * ext_len);
+ OPENSSL_free(ext_out);
+ }
+ OPENSSL_free(ext_out);
+ }
+ }
+
Expand Down Expand Up @@ -134,8 +134,8 @@ diff -Naurp nginx-1.14.0.orig/src/event/ngx_event_openssl.c nginx-1.14.0/src/eve
c->send = ngx_ssl_write;
c->recv_chain = ngx_ssl_recv_chain;
diff -Naurp nginx-1.14.0.orig/src/event/ngx_event_openssl.h nginx-1.14.0/src/event/ngx_event_openssl.h
--- nginx-1.14.0.orig/src/event/ngx_event_openssl.h 2018-04-17 18:22:36.000000000 +0300
+++ nginx-1.14.0/src/event/ngx_event_openssl.h 2020-10-26 21:10:34.943067201 +0300
--- nginx-1.14.0.orig/src/event/ngx_event_openssl.h 2022-07-26 12:37:49.136566490 +0430
+++ nginx-1.14.0/src/event/ngx_event_openssl.h 2022-07-26 12:37:56.666566384 +0430
@@ -86,6 +86,23 @@ struct ngx_ssl_connection_s {
unsigned no_wait_shutdown:1;
unsigned no_send_shutdown:1;
Expand Down
22 changes: 11 additions & 11 deletions patches/nginx.1.17.1.ssl.extensions.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -r d964b0aee8e7 src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c Thu May 23 16:49:22 2019 +0300
+++ b/src/event/ngx_event_openssl.c Sat Jun 01 14:53:52 2019 +0000
@@ -1588,6 +1588,108 @@
diff -Naurp nginx-1.17.1.orig/src/event/ngx_event_openssl.c nginx-1.17.1/src/event/ngx_event_openssl.c
--- nginx-1.17.1.orig/src/event/ngx_event_openssl.c 2022-07-26 12:21:34.726580042 +0430
+++ nginx-1.17.1/src/event/ngx_event_openssl.c 2022-07-26 12:24:59.656577206 +0430
@@ -1588,6 +1588,108 @@ ngx_ssl_set_session(ngx_connection_t *c,
return NGX_OK;
}

Expand Down Expand Up @@ -98,8 +98,8 @@ diff -r d964b0aee8e7 src/event/ngx_event_openssl.c
+ if (c->ssl->extensions != NULL) {
+ c->ssl->extensions_size = ext_len;
+ ngx_memcpy(c->ssl->extensions, ext_out, sizeof(int) * ext_len);
+ OPENSSL_free(ext_out);
+ }
+ OPENSSL_free(ext_out);
+ }
+ }
+
Expand All @@ -110,7 +110,7 @@ diff -r d964b0aee8e7 src/event/ngx_event_openssl.c

ngx_int_t
ngx_ssl_handshake(ngx_connection_t *c)
@@ -1603,6 +1704,10 @@
@@ -1603,6 +1705,10 @@ ngx_ssl_handshake(ngx_connection_t *c)

ngx_ssl_clear_error(c->log);

Expand All @@ -121,7 +121,7 @@ diff -r d964b0aee8e7 src/event/ngx_event_openssl.c
n = SSL_do_handshake(c->ssl->connection);

ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_do_handshake: %d", n);
@@ -1623,6 +1728,12 @@
@@ -1623,6 +1729,12 @@ ngx_ssl_handshake(ngx_connection_t *c)

c->ssl->handshaked = 1;

Expand All @@ -134,10 +134,10 @@ diff -r d964b0aee8e7 src/event/ngx_event_openssl.c
c->recv = ngx_ssl_recv;
c->send = ngx_ssl_write;
c->recv_chain = ngx_ssl_recv_chain;
diff -r d964b0aee8e7 src/event/ngx_event_openssl.h
--- a/src/event/ngx_event_openssl.h Thu May 23 16:49:22 2019 +0300
+++ b/src/event/ngx_event_openssl.h Sat Jun 01 14:53:52 2019 +0000
@@ -99,6 +99,23 @@
diff -Naurp nginx-1.17.1.orig/src/event/ngx_event_openssl.h nginx-1.17.1/src/event/ngx_event_openssl.h
--- nginx-1.17.1.orig/src/event/ngx_event_openssl.h 2022-07-26 12:21:34.726580042 +0430
+++ nginx-1.17.1/src/event/ngx_event_openssl.h 2022-07-26 12:23:43.489911600 +0430
@@ -99,6 +99,23 @@ struct ngx_ssl_connection_s {
unsigned in_early:1;
unsigned early_preread:1;
unsigned write_blocked:1;
Expand Down