FIX | memory leak

Author: xiadnoring

src/worker/ManapiTcp.cpp

@@ -822,13 +822,6 @@ int manapi::net::worker::TCP::flush_write_(const worker::shared_conn &connection
                                     manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "TCP:packets(%d) were sent %p. now=%d",
                                         nbuff, connection.get(), conn->top->send_size);
 
-                                    if ((conn->flags & (ev::WRITE|ev::DISCONNECT)) == ev::WRITE && conn->ev_callback) {
-                                        if (base::call_user_callback(&conn->ev_callback, connection, ev::WRITE, nullptr, 0, nullptr)) {
-                                            conn->worker->close_connection(connection, CLOSE_CONN_ERR);
-                                            return;
-                                        }
-                                    }
-
                                     if (conn->flags & ev::DISCONNECT) {
                                         conn->worker->close_connection(connection, CLOSE_CONN_SHUTDOWN);
                                         return;
@@ -839,6 +832,13 @@ int manapi::net::worker::TCP::flush_write_(const worker::shared_conn &connection
                                         return;
                                     }
 
+                                    if (conn->flags & ev::WRITE && conn->ev_callback) {
+                                        if (base::call_user_callback(&conn->ev_callback, connection, ev::WRITE, nullptr, 0, nullptr)) {
+                                            conn->worker->close_connection(connection, CLOSE_CONN_ERR);
+                                            return;
+                                        }
+                                    }
+
                                     if ((conn->flags & CONN_SEND_END) && (conn->flags & CONN_RECV_END)) {
                                         manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "TCP:packets(%d) were sent after closing conn %p. now=%d",
                                             nbuff, connection.get(), conn->top->send_size);

src/worker/ManapiTlsOverTcp.cpp

@@ -136,11 +136,14 @@ ssize_t manapi::net::worker::TLS::sync_write_ex(const shared_conn &conn, ev::buf
     if (connection->flags & (ev::DISCONNECT))
         return -1;
 
+    this->ssl_bio_flush_write_(conn, connection, maxcnt, false);
+
     char buffer[32768];
     int cursor = 0;
     size_t lastcur = 0;
     ssize_t total = 0;
 
+
     while (nbuff) {
         if (connection->top->send_size > maxcnt)
             break;
@@ -175,37 +178,25 @@ ssize_t manapi::net::worker::TLS::sync_write_ex(const shared_conn &conn, ev::buf
                     rhs = this->ssl_write_(connection->ssl, buffer + current,
                         static_cast<int>(cursor - current));
 
-                if (rhs > 0) {
-                    current += rhs;
+                if (int erhs = this->ssl_bio_flush_write_(conn, connection, maxcnt, false)) {
+                    if (erhs == CONN_IO_WANT_WRITE) {
+                        if (this->flush_write_(conn, true))
+                            return CONN_IO_ERROR;
+                        return total + current;
+                    }
 
-                    if (int erhs = this->ssl_bio_flush_write_(conn, connection, maxcnt, false)) {
-                        if (erhs == CONN_IO_WANT_WRITE) {
-                            if (this->flush_write_(conn, true))
-                                return CONN_IO_ERROR;
-                            return total + current;
-                        }
+                    return CONN_IO_ERROR;
+                }
 
-                        return CONN_IO_ERROR;
-                    }
+                if (rhs > 0) {
+                    current += rhs;
                 }
                 else {
                     int err = this->ssl_get_error_(connection->ssl, rhs);
 
                     if (err) {
                         if (err == this->ssl_error_want_read_
                             || err == this->ssl_error_want_write_) {
-                            auto const erhs = this->ssl_bio_flush_write_(conn, connection, maxcnt, false);
-
-                            if (erhs) {
-                                if (erhs == CONN_IO_WANT_WRITE) {
-                                    if (this->flush_write_(conn, true))
-                                        return CONN_IO_ERROR;
-                                    return total + current;
-                                }
-
-                                return CONN_IO_ERROR;
-                            }
-
                             if (this->flush_write_(conn, true))
                                 return CONN_IO_ERROR;
 
@@ -237,17 +228,6 @@ ssize_t manapi::net::worker::TLS::sync_write_ex(const shared_conn &conn, ev::buf
 
 
     bool const cfinish = finish && total == size;
-    auto const err = this->ssl_bio_flush_write_(conn, connection, maxcnt, false);
-
-    if (err) {
-        if (err == CONN_IO_WANT_WRITE) {
-            if (this->flush_write_(conn, true))
-                return CONN_IO_ERROR;
-            return total;
-        }
-
-        return CONN_IO_ERROR;
-    }
 
     if (this->flush_write_(conn, cfinish))
         return CONN_IO_ERROR;