scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 12:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid use of strdupa

Browse Source
This commit is contained in:
Martin Pulec
2025-04-14 09:57:40 +02:00
parent d2fab937f7
commit 46ecc5ebda
2 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/host.cpp
View File

@@ -6,7 +6,7 @@
* This file contains common external definitions.
*/
/*
* Copyright (c) 2013-2024 CESNET
* Copyright (c) 2013-2025 CESNET
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,7 +78,6 @@
#include <sys/types.h> // for ssize_t
#include <tuple> // for tuple, get, make_tuple
#include <unistd.h> // for STDERR_FILENO
#include <vector> // for vector
#include "audio/audio_capture.h"
#include "audio/audio_filter.h"
@@ -88,7 +87,6 @@
#include "audio/utils.h"
#include "capture_filter.h"
#include "compat/platform_pipe.h"
#include "compat/strings.h" // strdupa
#include "compat/net.h" // for fd_t
#include "cuda_wrapper.h" // for cudaDeviceReset
#include "debug.h"
@@ -980,29 +978,27 @@ bool parse_params(const char *optarg, bool preinit)
print_param_doc();
return false;
}
char *tmp = strdupa(optarg);
char *item = nullptr;
char *save_ptr = nullptr;
while ((item = strtok_r(tmp, ",", &save_ptr)) != nullptr) {
tmp = nullptr;
char *key_cstr = item;
const char *val_cstr = "";
if (char *delim = strchr(item, '=')) {
val_cstr = delim + 1;
*delim = '\0';
std::string_view sv = optarg;
while (!sv.empty()) {
std::string key = std::string(tokenize(sv, ','));
std::string val;
std::string::size_type delim_pos = key.find('=');
if (delim_pos != std::string::npos) {
val = key.substr(delim_pos + 1);
key.resize(delim_pos);
}
if (!validate_param(key_cstr)) {
if (!validate_param(key.c_str())) {
if (preinit) {
continue;
}
LOG(LOG_LEVEL_ERROR) << "Unknown parameter: " << key_cstr << "\n";
LOG(LOG_LEVEL_ERROR) << "Unknown parameter: " << key << "\n";
LOG(LOG_LEVEL_INFO) << "Type '" << uv_argv[0] << " --param help' for list.\n";
if (get_commandline_param("allow-unknown-params") ==
nullptr) {
return false;
}
}
commandline_params[key_cstr] = val_cstr;
commandline_params[key] = std::move(val);
}
return true;
}