krb5 commit: Check for null *iter_p in profile_iterator()

Greg Hudson ghudson at mit.edu
Thu Jan 15 11:56:48 EST 2015


https://github.com/krb5/krb5/commit/9a343200d305e7c8df6e556d63afaee42194175f
commit 9a343200d305e7c8df6e556d63afaee42194175f
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.
    
    ticket: 8059 (new)
    target_version: 1.13.1
    tags: pullup

 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