svn rev #22016: branches/krb5-1-7/src/ lib/gssapi/generic/
tlyu@MIT.EDU
tlyu at MIT.EDU
Wed Feb 18 13:17:55 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=22016
Commit By: tlyu
Log Message:
ticket: 6362
version_fixed: 1.7
status: resolved
pull up r21886 from trunk
------------------------------------------------------------------------
r21886 | raeburn | 2009-02-04 18:28:09 -0500 (Wed, 04 Feb 2009) | 5 lines
Changed paths:
M /trunk/src/aclocal.m4
M /trunk/src/lib/gssapi/generic/oid_ops.c
ticket: 6362
subject: don't do arithmetic on void pointers
Fix one file in gssapi where we compute offsets from a void* without casting.
Change options used with Sun compiler to make such expressions an error.
------------------------------------------------------------------------
Changed Files:
U branches/krb5-1-7/src/aclocal.m4
U branches/krb5-1-7/src/lib/gssapi/generic/oid_ops.c
Modified: branches/krb5-1-7/src/aclocal.m4
===================================================================
--- branches/krb5-1-7/src/aclocal.m4 2009-02-18 18:17:47 UTC (rev 22015)
+++ branches/krb5-1-7/src/aclocal.m4 2009-02-18 18:17:54 UTC (rev 22016)
@@ -664,7 +664,7 @@
# works, but it also means that declaration-in-code warnings won't
# be issued.
# -v -fd -errwarn=E_DECLARATION_IN_CODE ...
- WARN_CFLAGS="-errtags=yes -errwarn=E_BAD_PTR_INT_COMBINATION"
+ WARN_CFLAGS="-errtags=yes -errwarn=E_BAD_PTR_INT_COMBINATION -errwarn=E_PTR_TO_VOID_IN_ARITHMETIC"
WARN_CXXFLAGS="-errtags=yes +w +w2 -xport64"
fi
fi
Modified: branches/krb5-1-7/src/lib/gssapi/generic/oid_ops.c
===================================================================
--- branches/krb5-1-7/src/lib/gssapi/generic/oid_ops.c 2009-02-18 18:17:47 UTC (rev 22015)
+++ branches/krb5-1-7/src/lib/gssapi/generic/oid_ops.c 2009-02-18 18:17:54 UTC (rev 22016)
@@ -440,7 +440,7 @@
return GSS_S_FAILURE;
}
- op = oid->elements + prefix_len + nbytes;
+ op = (unsigned char *) oid->elements + prefix_len + nbytes;
i = -1;
while (suffix) {
op[i] = (unsigned char)suffix & 0x7f;
@@ -472,7 +472,7 @@
return GSS_S_BAD_MECH;
}
- op = oid->elements + prefix_len;
+ op = (unsigned char *) oid->elements + prefix_len;
*suffix = 0;
More information about the cvs-krb5
mailing list