Skip to content
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

5.6 - Fixed PS-7346 - Huge memory usage for audit plugin when large queries… #4073

Merged
merged 1 commit into from
Oct 14, 2020
Merged

5.6 - Fixed PS-7346 - Huge memory usage for audit plugin when large queries… #4073

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
16 changes: 11 additions & 5 deletions plugin/audit_log/audit_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,14 @@ char *audit_log_general_record(char *buf, size_t buflen,
query_length= my_charset_utf8mb4_general_ci.mbmaxlen *
event->general_query_length;

/* Note: query_length is the maximun size using utf8m4(4 bytes) that
* event->general_query_length may use. In the if branch, we convert it to
* utf8mb4. We store the recalculated (real size) length to query variable
* and use the remaing of the buffer for the output that will be printed to
* audit log. Parameter char *buf must be big enough to store
* the query (using utf8mb4) + the full output of audit event, which will
* contain the query again. At the else branch we estime this size.
*/
if (query_length < (size_t) (endbuf - endptr))
{
uint errors;
Expand All @@ -639,7 +647,7 @@ char *audit_log_general_record(char *buf, size_t buflen,
query= escape_string(event->general_query, event->general_query_length,
endptr, endbuf - endptr, &endptr, &full_outlen);
full_outlen*= my_charset_utf8mb4_general_ci.mbmaxlen;
full_outlen+= query_length * my_charset_utf8mb4_general_ci.mbmaxlen;
full_outlen+= query_length;
}

user= escape_string(event->general_user, event->general_user_length,
Expand All @@ -654,10 +662,8 @@ char *audit_log_general_record(char *buf, size_t buflen,
db= escape_string(default_db, strlen(default_db),
endptr, endbuf - endptr, &endptr, &full_outlen);

buflen_estimated= full_outlen * 2 +
strlen(format_string[audit_log_format]) +
strlen(name) +
event->general_sql_command.length +
buflen_estimated= full_outlen + strlen(format_string[audit_log_format]) +
strlen(name) + event->general_sql_command.length +
20 + /* general_thread_id */
20 + /* status */
MAX_RECORD_ID_SIZE + MAX_TIMESTAMP_SIZE;
Expand Down