Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845 am: 11cd3180a5
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64897a55b9c9759af84f50be737d107915408e0b
diff --git a/compress_plugin.c b/compress_plugin.c
index 24d72ee..7a5538d 100644
--- a/compress_plugin.c
+++ b/compress_plugin.c
@@ -366,14 +366,15 @@
fprintf(stderr, "%s: invalid library name\n", __func__);
goto err_open_fn;
}
- open_fn = calloc(1, strlen(name) + strlen("_open") + 1);
+ const size_t open_fn_size = strlen(name) + strlen("_open") + 1;
+ open_fn = calloc(1, open_fn_size);
if (!open_fn) {
rc = -ENOMEM;
goto err_open_fn;
}
- strlcpy(open_fn, name, strlen(name) + 1);
- strlcat(open_fn, "_open", strlen(name) + strlen("_open") + 1);
+ strlcpy(open_fn, name, open_fn_size);
+ strlcat(open_fn, "_open", open_fn_size);
plug_data->plugin_open_fn = dlsym(dl_hdl, open_fn);
if (!plug_data->plugin_open_fn) {
