diff options
author | Ran Benita <ran@unusedvar.com> | 2019-11-09 11:39:17 +0200 |
---|---|---|
committer | Ran Benita <ran@unusedvar.com> | 2019-11-09 11:40:07 +0200 |
commit | 1fe1b65385d56e0bdaa11ced7b8baef6b018ca84 (patch) | |
tree | 593f92a8eb35225999ab728a13204c0b8e2c0969 /src/atom.c | |
parent | a5f95c2b3c9de5ba46c8f591ed00507b4f05a8e8 (diff) | |
download | xorg-lib-libxkbcommon-1fe1b65385d56e0bdaa11ced7b8baef6b018ca84.tar.gz |
atom: remove handling of garbage input
Signed-off-by: Ran Benita <ran@unusedvar.com>
Diffstat (limited to 'src/atom.c')
-rw-r--r-- | src/atom.c | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -117,9 +117,7 @@ atom_table_free(struct atom_table *table) const char * atom_text(struct atom_table *table, xkb_atom_t atom) { - if (atom == XKB_ATOM_NONE || atom >= darray_size(table->table)) - return NULL; - + assert(atom < darray_size(table->table)); return darray_item(table->table, atom).string; } @@ -173,9 +171,6 @@ atom_lookup(struct atom_table *table, const char *string, size_t len) { xkb_atom_t *atomp; - if (!string) - return XKB_ATOM_NONE; - if (!find_atom_pointer(table, string, len, &atomp, NULL)) return XKB_ATOM_NONE; @@ -189,16 +184,12 @@ atom_intern(struct atom_table *table, const char *string, size_t len) struct atom_node node; uint32_t fingerprint; - if (!string) - return XKB_ATOM_NONE; - if (find_atom_pointer(table, string, len, &atomp, &fingerprint)) { return *atomp; } node.string = strndup(string, len); - if (!node.string) - return XKB_ATOM_NONE; + assert(node.string != NULL); node.left = node.right = XKB_ATOM_NONE; node.fingerprint = fingerprint; |