diff options
| author | Simo Sorce <simo@redhat.com> | 2014-06-09 15:29:24 -0400 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2014-06-09 15:34:18 -0400 |
| commit | 60ab08cfec53a24ecca24d581ebc6dd2af0e1f71 (patch) | |
| tree | 05ff58818da4557bb9124e15404df00c861bde38 | |
| parent | 3904eae57a79f2c535ab2c8b8ea8a9932e4b5e4e (diff) | |
| download | lasso-60ab08cfec53a24ecca24d581ebc6dd2af0e1f71.tar.gz lasso-60ab08cfec53a24ecca24d581ebc6dd2af0e1f71.tar.xz lasso-60ab08cfec53a24ecca24d581ebc6dd2af0e1f71.zip | |
Do not dereference null pointers
Sounds like these should all be boolean 'OR's, otherwise,
if profile is not in fact a lasso profile then profile->private_data
will be dereferenced even if it is NULL.
Found by Clang
License: MIT
Signed-off-by: Simo Sorce <simo@redhat.com>
| -rw-r--r-- | lasso/id-ff/profile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c index fbdab768..9518b9a5 100644 --- a/lasso/id-ff/profile.c +++ b/lasso/id-ff/profile.c @@ -559,7 +559,7 @@ static LassoNodeClass *parent_class = NULL; void lasso_profile_set_signature_hint(LassoProfile *profile, LassoProfileSignatureHint signature_hint) { - if (! LASSO_IS_PROFILE(profile) && ! profile->private_data) + if (! LASSO_IS_PROFILE(profile) || ! profile->private_data) return; profile->private_data->signature_hint = signature_hint; } @@ -576,7 +576,7 @@ LassoProfileSignatureHint lasso_profile_get_signature_hint(LassoProfile *profile) { LassoProfileSignatureVerifyHint signature_verify_hint; - if (! LASSO_IS_PROFILE(profile) && ! profile->private_data) + if (! LASSO_IS_PROFILE(profile) || ! profile->private_data) return LASSO_PROFILE_SIGNATURE_HINT_MAYBE; signature_verify_hint = profile->private_data->signature_verify_hint; if (signature_verify_hint >= LASSO_PROFILE_SIGNATURE_VERIFY_HINT_LAST) { @@ -600,7 +600,7 @@ void lasso_profile_set_signature_verify_hint(LassoProfile *profile, LassoProfileSignatureVerifyHint signature_verify_hint) { - if (! LASSO_IS_PROFILE(profile) && ! profile->private_data) + if (! LASSO_IS_PROFILE(profile) || ! profile->private_data) return; if (signature_verify_hint >= LASSO_PROFILE_SIGNATURE_VERIFY_HINT_LAST) { message(G_LOG_LEVEL_WARNING, "%i is an invalid argument for " __FUNCTION__, @@ -622,7 +622,7 @@ lasso_profile_set_signature_verify_hint(LassoProfile *profile, LassoProfileSignatureVerifyHint lasso_profile_get_signature_verify_hint(LassoProfile *profile) { - if (! LASSO_IS_PROFILE(profile) && ! profile->private_data) + if (! LASSO_IS_PROFILE(profile) || ! profile->private_data) return LASSO_PROFILE_SIGNATURE_HINT_MAYBE; return profile->private_data->signature_verify_hint; } |