luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-10 11:14:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus-codegen: Safer header guards

Browse Source 
Whitelist a safe set of characters for use in header guards instead of
maintaining a (growing) blacklist.

The whitelist is intentionally short since reading up on all
peculiarities of the C and C++ standard for identifiers is not my idea
of fun. :)

Fixes #1379
This commit is contained in:
Mattias Bengtsson
2019-10-29 16:01:39 +01:00
committed by Philip Withnall
parent 623bdfd7ab
commit 4aaeac5b3c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gdbus-2.0/codegen/codegen.py
View File

@@ -51,6 +51,13 @@ def generate_namespace(namespace):
return (ns, ns_upper, ns_lower) return (ns, ns_upper, ns_lower)
def generate_header_guard(header_name):
# There might be more characters that are safe to use than these, but lets
# stay conservative.
safe_valid_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
return ''.join(map(lambda c: c if c in safe_valid_chars else '_',
header_name.upper()))
class HeaderCodeGenerator: class HeaderCodeGenerator:
def __init__(self, ifaces, namespace, generate_objmanager, def __init__(self, ifaces, namespace, generate_objmanager,
generate_autocleanup, header_name, input_files_basenames, generate_autocleanup, header_name, input_files_basenames,
@@ -59,7 +66,7 @@ class HeaderCodeGenerator:
self.namespace, self.ns_upper, self.ns_lower = generate_namespace(namespace) self.namespace, self.ns_upper, self.ns_lower = generate_namespace(namespace)
self.generate_objmanager = generate_objmanager self.generate_objmanager = generate_objmanager
self.generate_autocleanup = generate_autocleanup self.generate_autocleanup = generate_autocleanup
self.header_guard = header_name.upper().replace('.', '_').replace('-', '_').replace('/', '_').replace(':', '_') self.header_guard = generate_header_guard(header_name)
self.input_files_basenames = input_files_basenames self.input_files_basenames = input_files_basenames
self.use_pragma = use_pragma self.use_pragma = use_pragma
self.outfile = outfile self.outfile = outfile
@@ -613,7 +620,7 @@ class InterfaceInfoHeaderCodeGenerator:
def __init__(self, ifaces, namespace, header_name, input_files_basenames, use_pragma, outfile): def __init__(self, ifaces, namespace, header_name, input_files_basenames, use_pragma, outfile):
self.ifaces = ifaces self.ifaces = ifaces
self.namespace, self.ns_upper, self.ns_lower = generate_namespace(namespace) self.namespace, self.ns_upper, self.ns_lower = generate_namespace(namespace)
self.header_guard = header_name.upper().replace('.', '_').replace('-', '_').replace('/', '_').replace(':', '_') self.header_guard = generate_header_guard(header_name)
self.input_files_basenames = input_files_basenames self.input_files_basenames = input_files_basenames
self.use_pragma = use_pragma self.use_pragma = use_pragma
self.outfile = outfile self.outfile = outfile