]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Remove meaningless checks decoding DB2 principals
authorGreg Hudson <ghudson@mit.edu>
Tue, 6 Sep 2016 16:58:57 +0000 (12:58 -0400)
committerTom Yu <tlyu@mit.edu>
Fri, 9 Sep 2016 21:10:23 +0000 (17:10 -0400)
Commit e3d9f03a658e247dbb43cb345aa93a28782fd995 (ticket 8481) added
several checks for negative length values when decoding DB2 principal
entries, including two unnecessary checks on unsigned values.  Remove
those checks as they can generate warnings.

(cherry picked from commit c0f08f2eadbf179ec30008893a125722536c7802)

ticket: 8491
version_fixed: 1.13.7

src/plugins/kdb/db2/kdb_xdr.c

index 9c2614a11bbf40c0f8f0c739f9f9ef4e718c6a16..e6a030fcde2faeaa0f7a87f57720619f7b537010 100644 (file)
@@ -364,8 +364,7 @@ krb5_decode_princ_entry(krb5_context context, krb5_data *content,
         krb5_kdb_decode_int16(nextloc, (*tl_data)->tl_data_length);
         nextloc += 2;
 
-        if ((*tl_data)->tl_data_length < 0 ||
-            (*tl_data)->tl_data_length > sizeleft) {
+        if ((*tl_data)->tl_data_length > sizeleft) {
             retval = KRB5_KDB_TRUNCATED_RECORD;
             goto error_out;
         }
@@ -414,8 +413,7 @@ krb5_decode_princ_entry(krb5_context context, krb5_data *content,
                 krb5_kdb_decode_int16(nextloc, key_data->key_data_length[j]);
                 nextloc += 2;
 
-                if (key_data->key_data_length[j] < 0 ||
-                    key_data->key_data_length[j] > sizeleft) {
+                if (key_data->key_data_length[j] > sizeleft) {
                     retval = KRB5_KDB_TRUNCATED_RECORD;
                     goto error_out;
                 }