ITS#7588 fix double-free for sorted paged search

[openldap] / servers / slapd / back-perl / compare.c

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index e03c486cd55d989560df1cf3e8d9da0e5867f04e..51e66f29b85309e48b72f653470d9a92e6c175f6 100644 (file)
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -1,27 +1,22 @@
 /* $OpenLDAP$ */
-/*
- *      Copyright 1999, John C. Quillan, All rights reserved.
- *      Portions Copyright 2002, myinternet Limited. All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *      Redistribution and use in source and binary forms are permitted only
- *      as authorized by the OpenLDAP Public License.  A copy of this
- *      license is available at http://www.OpenLDAP.org/license.html or
- *      in file LICENSE in the top-level directory of the distribution.
+ * Copyright 1999-2013 The OpenLDAP Foundation.
+ * Portions Copyright 1999 John C. Quillan.
+ * Portions Copyright 2002 myinternet Limited.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include "portable.h"
-
-#include <stdio.h>
-
-#include "slap.h"
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include <EXTERN.h>
-#include <perl.h>
-
 #include "perl_back.h"
+#include "lutil.h"
 
 /**********************************************************
  *
@@ -34,18 +29,20 @@ perl_back_compare(
        Operation       *op,
        SlapReply       *rs )
 {
-       int count;
-       char *avastr, *ptr;
+       int count, avalen;
+       char *avastr;
 
        PerlBackend *perl_back = (PerlBackend *)op->o_bd->be_private;
 
-       avastr = ch_malloc( op->orc_ava->aa_desc->ad_cname.bv_len + 1 +
-               op->orc_ava->aa_value.bv_len + 1 );
-       
+       avalen = op->orc_ava->aa_desc->ad_cname.bv_len + 1 +
+               op->orc_ava->aa_value.bv_len;
+       avastr = ch_malloc( avalen + 1 );
+
        lutil_strcopy( lutil_strcopy( lutil_strcopy( avastr,
                op->orc_ava->aa_desc->ad_cname.bv_val ), "=" ),
                op->orc_ava->aa_value.bv_val );
 
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -53,15 +50,11 @@ perl_back_compare(
 
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0)));
-               XPUSHs(sv_2mortal(newSVpv( avastr , 0)));
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , op->o_req_dn.bv_len)));
+               XPUSHs(sv_2mortal(newSVpv( avastr , avalen)));
                PUTBACK;
 
-#ifdef PERL_IS_5_6
                count = call_method("compare", G_SCALAR);
-#else
-               count = perl_call_method("compare", G_SCALAR);
-#endif
 
                SPAGAIN;