krb5 commit [krb5-1.13]: Check for null *iter_p in profile_iterator()

Tom Yu tlyu at mit.edu
Fri Jan 16 17:23:46 EST 2015


https://github.com/krb5/krb5/commit/c0a12dd63f696b95b35826aefed7282bd7954325
commit c0a12dd63f696b95b35826aefed7282bd7954325
Author: Greg Hudson <ghudson at mit.edu>
Date:   Wed Jan 14 13:10:39 2015 -0500

    Check for null *iter_p in profile_iterator()
    
    In profile_iterator(), return PROF_MAGIC_ITERATOR if *iter_p is NULL,
    instead of dereferencing a null pointer, as we did prior to 1.10.
    Correct calling code will not trigger this case, but incorrect code
    has been reported in the field.
    
    (cherry picked from commit 9a343200d305e7c8df6e556d63afaee42194175f)
    
    ticket: 8059
    version_fixed: 1.13.1
    status: resolved

 src/util/profile/prof_get.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/util/profile/prof_get.c b/src/util/profile/prof_get.c
index 3eba787..16a1762 100644
--- a/src/util/profile/prof_get.c
+++ b/src/util/profile/prof_get.c
@@ -579,7 +579,7 @@ profile_iterator(void **iter_p, char **ret_name, char **ret_value)
         *ret_name = NULL;
     if (ret_value)
         *ret_value = NULL;
-    if (iter->magic != PROF_MAGIC_ITERATOR)
+    if (iter == NULL || iter->magic != PROF_MAGIC_ITERATOR)
         return PROF_MAGIC_ITERATOR;
     profile = iter->profile;
 


More information about the cvs-krb5 mailing list