--- servers/slapd/overlays/valsort.c	2007/01/02 21:44:09	1.9.2.6
+++ servers/slapd/overlays/valsort.c	2007/06/08 08:13:18	1.9.2.7
@@ -1,5 +1,5 @@
 /* valsort.c - sort attribute values */
-/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/valsort.c,v 1.9.2.5 2006/01/03 22:16:25 kurt Exp $ */
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 2005-2007 The OpenLDAP Foundation.
@@ -447,6 +447,9 @@ valsort_modify( Operation *op, SlapReply
 		if ( !(vi->vi_sort & VALSORT_WEIGHTED ))
 			continue;
 		for (ml = op->orm_modlist; ml; ml=ml->sml_next ) {
+			/* Must be a Delete Attr op, so no values to consider */
+			if ( !ml->sml_values )
+				continue;
 			if ( ml->sml_desc == vi->vi_ad )
 				break;
 		}