* accept_sec_context.c (krb5_gss_accept_sec_context): Call

	TREAD_STR with correct arguments.  Patch from Emily Ratliff.

ticket: 1015
tags: pullup
target_version: 1.3.1

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15687 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 814d61c30ffcccb30ac42523089c210879035608..e2cf84f4c00e2f2dea197330562e4b44e01959ed 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-14  Tom Yu  <tlyu@mit.edu>
+
+       * accept_sec_context.c (krb5_gss_accept_sec_context): Call
+       TREAD_STR with correct arguments.  Patch from Emily Ratliff.
+
 2003-07-10  Tom Yu  <tlyu@mit.edu>
 
        * acquire_cred.c (acquire_init_cred): Close the ccache if

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 4cc0651afa6929079aabb219bc31c762d8db5b02..3367c1da753b55fa83f2bacea2df5dd7df3e9b2f 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -515,16 +515,16 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
 
               i -= 4;
 
-              /* have to use ptr2, since option.data is wrong type and
-                 macro uses ptr as both lvalue and rvalue */
-
               if (i < option.length || option.length < 0) {
                   code = KG_BAD_LENGTH;
                   major_status = GSS_S_FAILURE;
                   goto fail;
               }
 
-              TREAD_STR(ptr, ptr2, bigend);
+              /* have to use ptr2, since option.data is wrong type and
+                 macro uses ptr as both lvalue and rvalue */
+
+              TREAD_STR(ptr, ptr2, option.length);
               option.data = (char *) ptr2;
 
               i -= option.length;