From 526e875cec15761099438e17df3f56bc2bd5b761 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 8 Aug 2012 15:35:28 -0700 Subject: Check error returns from strupper_m() (in all reasonable places). --- source3/registry/reg_backend_db.c | 4 +++- source3/registry/reg_util_internal.c | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'source3/registry') diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index 75ad507e2b..3e561eb389 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -561,7 +561,9 @@ static bool upgrade_v2_to_v3_check_subkeylist(struct db_context *db, }; bool success = false; char *path = talloc_asprintf(talloc_tos(), "%s\\%s", key, subkey); - strupper_m(path); + if (!strupper_m(path)) { + goto done; + } if (!dbwrap_exists(db, string_term_tdb_data(path))) { NTSTATUS status; diff --git a/source3/registry/reg_util_internal.c b/source3/registry/reg_util_internal.c index b15015b988..e256c75cb2 100644 --- a/source3/registry/reg_util_internal.c +++ b/source3/registry/reg_util_internal.c @@ -113,7 +113,10 @@ char *normalize_reg_path(TALLOC_CTX *ctx, const char *keyname ) p = strrchr(nkeyname, '\\'); } - strupper_m(nkeyname); + if (!strupper_m(nkeyname)) { + TALLOC_FREE(nkeyname); + return NULL; + } return nkeyname; } -- cgit