From: Douglas Bagnall Date: Thu, 20 Jun 2024 22:38:40 +0000 (+1200) Subject: buildtools: sanitise strange characters in vendor strings X-Git-Tag: tdb-1.4.11~216 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bc5b6f29307ce758774c1b2f48ce62315fdc7f9;p=thirdparty%2Fsamba.git buildtools: sanitise strange characters in vendor strings There is no reason to think '-' and '+' are the only characters that might sneak into a vendor string; Debian habitually use '~'. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15673 Signed-off-by: Douglas Bagnall Reviewed-by: Jo Sutton --- diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py index 2d9505d255c..c82ba3424f9 100644 --- a/buildtools/wafsamba/samba_abi.py +++ b/buildtools/wafsamba/samba_abi.py @@ -286,7 +286,7 @@ def abi_build_vscript(task): f.close() def VSCRIPT_MAP_PRIVATE(bld, libname, orig_vscript, version, private_vscript): - version = version.replace("-", "_").replace("+","_").upper() + version = re.sub(r'\W', '_', version).upper() t = bld.SAMBA_GENERATOR(private_vscript, rule=abi_build_vscript, source=orig_vscript, @@ -314,8 +314,8 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript, abi_match=None, p libname = os.path.basename(libname) version = os.path.basename(version) - libname = libname.replace("-", "_").replace("+","_").upper() - version = version.replace("-", "_").replace("+","_").upper() + libname = re.sub(r'\W', '_', libname).upper() + version = re.sub(r'\W', '_', version).upper() t = bld.SAMBA_GENERATOR(vscript, rule=abi_build_vscript,