[Pkg-ocaml-maint-commits] [pcre-ocaml] 11/18: Imported Upstream version 7.2.3

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository pcre-ocaml.

commit ab09858cea40f6e1f3d24c20447286b461b5e6f0
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Aug 3 13:44:54 2016 +0200

    Imported Upstream version 7.2.3
---
 CHANGES.txt      |  6 ++++++
 _oasis           |  2 +-
 lib/META         |  4 ++--
 lib/pcre_stubs.c | 12 ++++++------
 setup.ml         |  6 +++---
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f4f4f20..9bc9875 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+2016-02-25:  Minor version release v7.2.3:
+
+               Fixed callout bug introduced with v7.2.0.
+
+             Thanks to Raman Varabets for the bug report!
+
 2016-02-23:  Fixed linking problem with old versions of PCRE (< 8.20).
 
              Fixed backward compatibility issue with OCaml <= 3.12.
diff --git a/_oasis b/_oasis
index fb69cb4..cd9c495 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat:      0.4
 Name:             pcre
-Version:          7.2.2
+Version:          7.2.3
 Synopsis:         pcre-ocaml - bindings to the Perl Compatibility Regular Expressions library
 Description:      pcre-ocaml offers library functions for string pattern matching and substitution, similar to the functionality offered by the Perl language.
 Authors:          Markus Mottl <markus.mottl at gmail.com>
diff --git a/lib/META b/lib/META
index 4b6f9a7..a390c2a 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 4e0b6deea390af304684cc7986d12440)
-version = "7.2.2"
+# DO NOT EDIT (digest: cb789041f764b2acbd73833b69d2f763)
+version = "7.2.3"
 description =
 "pcre-ocaml - bindings to the Perl Compatibility Regular Expressions library"
 requires = "bytes"
diff --git a/lib/pcre_stubs.c b/lib/pcre_stubs.c
index ff0775e..8f2eb7f 100644
--- a/lib/pcre_stubs.c
+++ b/lib/pcre_stubs.c
@@ -502,14 +502,14 @@ static inline void handle_exec_error(char *loc, const int ret)
 }
 
 static inline void handle_pcre_exec_result(
-  value v_ovec, long ovec_len, long subj_start, int ret)
+  int *ovec, value v_ovec, long ovec_len, long subj_start, int ret)
 {
-  int *ovec = (int *) &Field(v_ovec, 0);
+  ovec_dst_ptr ocaml_ovec = (ovec_dst_ptr) &Field(v_ovec, 0);
   const int subgroups2 = ret * 2;
   const int subgroups2_1 = subgroups2 - 1;
   const int *ovec_src = ovec + subgroups2_1;
-  ovec_dst_ptr ovec_clear_stop = (ovec_dst_ptr) ovec + (ovec_len * 2) / 3;
-  ovec_dst_ptr ovec_dst = (ovec_dst_ptr) ovec + subgroups2_1;
+  ovec_dst_ptr ovec_clear_stop = ocaml_ovec + (ovec_len * 2) / 3;
+  ovec_dst_ptr ovec_dst = ocaml_ovec + subgroups2_1;
   copy_ovector(subj_start, ovec_src, ovec_dst, subgroups2);
   while (++ovec_dst < ovec_clear_stop) *ovec_dst = -1;
 }
@@ -553,7 +553,7 @@ CAMLprim value pcre_exec_stub(value v_opt, value v_rex, value v_pos,
       ret = pcre_exec(code, extra, ocaml_subj, len, pos, opt, ovec, ovec_len);
 
       if (ret < 0) handle_exec_error("pcre_exec_stub", ret);
-      else handle_pcre_exec_result(v_ovec, ovec_len, subj_start, ret);
+      else handle_pcre_exec_result(ovec, v_ovec, ovec_len, subj_start, ret);
     }
 
     /* There are callout functions */
@@ -618,7 +618,7 @@ CAMLprim value pcre_exec_stub(value v_opt, value v_rex, value v_pos,
         if (ret == PCRE_ERROR_CALLOUT) caml_raise(cod.v_exn);
         else handle_exec_error("pcre_exec_stub(callout)", ret);
       } else {
-        handle_pcre_exec_result(v_ovec, ovec_len, subj_start, ret);
+        handle_pcre_exec_result(ovec, v_ovec, ovec_len, subj_start, ret);
         caml_stat_free(ovec);
       }
     }
diff --git a/setup.ml b/setup.ml
index 45f5235..ed227dc 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: ac9bfdf81b51ef959bf1488a96bd692f) *)
+(* DO NOT EDIT (digest: 38794f7cfce3025e3df1ae193dcdf30a) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6683,7 +6683,7 @@ let setup_t =
           alpha_features = [];
           beta_features = [];
           name = "pcre";
-          version = "7.2.2";
+          version = "7.2.3";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -6983,7 +6983,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "��\0176�\020A�0YQ\142\022}\021\148";
+     oasis_digest = Some "l��]�\001hQ�r�\019N���";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/pcre-ocaml.git