From f86d1a2e03fcc6876d7f0e27e2a2f394963b7ae2 Mon Sep 17 00:00:00 2001 From: Vidyakumar Athota Date: Thu, 10 Dec 2020 12:11:01 +0100 Subject: [PATCH] tinycompress: Fix error handling in plugins. Bug: 166667071 Test: manual offload playback Test: cts AudioTrackOffloadTest CRs-Fixed: 2608556 Change-Id: I7ea6a7bb712367546607b8d7985cc4de8ca2455f --- compress_plugin.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/compress_plugin.c b/compress_plugin.c index d445ae9..24d72ee 100644 --- a/compress_plugin.c +++ b/compress_plugin.c @@ -1,6 +1,6 @@ /* compress_plugin.c ** -** Copyright (c) 2019, The Linux Foundation. All rights reserved. +** Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. ** ** Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are @@ -333,10 +333,9 @@ static int compress_plug_open(unsigned int card, unsigned int device, unsigned int flags, void **data, void *node) { struct compress_plug_data *plug_data; - const char *err = NULL; void *dl_hdl; int rc = 0; - char *so_name, *open_fn, token[80], *name; + char *so_name, *open_fn, token[80], *name, *token_saveptr; plug_data = calloc(1, sizeof(*plug_data)); if (!plug_data) { @@ -361,22 +360,25 @@ static int compress_plug_open(unsigned int card, unsigned int device, } sscanf(so_name, "lib%s", token); - name = strtok(token, "."); + token_saveptr = token; + name = strtok_r(token, ".", &token_saveptr); + if (!name) { + fprintf(stderr, "%s: invalid library name\n", __func__); + goto err_open_fn; + } open_fn = calloc(1, strlen(name) + strlen("_open") + 1); if (!open_fn) { rc = -ENOMEM; goto err_open_fn; } - strncpy(open_fn, name, strlen(name) + 1); - strcat(open_fn, "_open"); + strlcpy(open_fn, name, strlen(name) + 1); + strlcat(open_fn, "_open", strlen(name) + strlen("_open") + 1); plug_data->plugin_open_fn = dlsym(dl_hdl, open_fn); - err = dlerror(); - - if (err) { + if (!plug_data->plugin_open_fn) { fprintf(stderr, "%s: dlsym to open fn failed, err = '%s'\n", - __func__, err); + __func__, dlerror()); goto err_dlsym; }