diff options
| author | Eric Laurent <elaurent@google.com> | 2021-01-15 09:16:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-15 09:16:54 +0000 |
| commit | 11cd3180a510cfd353b9dc2b6f76b7d2f00c6c1e (patch) | |
| tree | 6ea241a70764536c47044aeb51ce040174429368 | |
| parent | 961c9afd6b36d5e60a19368358ed9b81a9febeb8 (diff) | |
| parent | 8bf575a8455a51dd2217846bfae3933502bd7838 (diff) | |
| download | tinycompress-11cd3180a510cfd353b9dc2b6f76b7d2f00c6c1e.tar.gz | |
Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib472495de7591bd275fe7e359ed76db991389907
| -rw-r--r-- | compress_plugin.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 @@ static int compress_plug_open(unsigned int card, unsigned int device, 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) { |