Adapted from upstream commit 659615c7b100a89eafe6253e7a5b9d84d0e8df74,
this patch omits the upstream changes to 'Changes' and 'VERSION'.
http://seclists.org/oss-sec/2016/q2/170
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8869
https://github.com/ocaml/ocaml/commit/659615c7b100a89eafe6253e7a5b9d84d0e8df74
---
byterun/alloc.c | 4 ++--
byterun/intern.c | 2 +-
byterun/str.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/byterun/alloc.c b/byterun/alloc.c
index 96a21bf..0db9947 100644
--- a/byterun/alloc.c
+++ b/byterun/alloc.c
@@ -153,7 +153,7 @@ CAMLexport int caml_convert_flag_list(value list, int *flags)
/* [size] is a [value] representing number of words (fields) */
CAMLprim value caml_alloc_dummy(value size)
{
- mlsize_t wosize = Int_val(size);
+ mlsize_t wosize = Long_val(size);
if (wosize == 0) return Atom(0);
return caml_alloc (wosize, 0);
@@ -169,7 +169,7 @@ CAMLprim value caml_alloc_dummy_function(value size,value arity)
/* [size] is a [value] representing number of floats. */
CAMLprim value caml_alloc_dummy_float (value size)
{
- mlsize_t wosize = Int_val(size) * Double_wosize;
+ mlsize_t wosize = Long_val(size) * Double_wosize;
if (wosize == 0) return Atom(0);
return caml_alloc (wosize, 0);
diff --git a/byterun/intern.c b/byterun/intern.c
index 89d13d1..7b8d049 100644
--- a/byterun/intern.c
+++ b/byterun/intern.c
@@ -291,7 +291,7 @@ static void intern_rec(value *dest)
case OFreshOID:
/* Refresh the object ID */
/* but do not do it for predefined exception slots */
- if (Int_val(Field((value)dest, 1)) >= 0)
+ if (Long_val(Field((value)dest, 1)) >= 0)
caml_set_oo_id((value)dest);
/* Pop item and iterate */
sp--;
diff --git a/byterun/str.c b/byterun/str.c
index 5ad4e29..885772f 100644
--- a/byterun/str.c
+++ b/byterun/str.c
@@ -266,7 +266,7 @@ CAMLprim value caml_string_greaterequal(value s1, value s2)
CAMLprim value caml_blit_string(value s1, value ofs1, value s2, value ofs2,
value n)
{
- memmove(&Byte(s2, Long_val(ofs2)), &Byte(s1, Long_val(ofs1)), Int_val(n));
+ memmove(&Byte(s2, Long_val(ofs2)), &Byte(s1, Long_val(ofs1)), Long_val(n));
return Val_unit;
}
@@ -278,7 +278,7 @@ CAMLprim value caml_fill_string(value s, value offset, value len, value init)
CAMLprim value caml_bitvect_test(value bv, value n)
{
- int pos = Int_val(n);
+ intnat pos = Long_val(n);
return Val_int(Byte_u(bv, pos >> 3) & (1 << (pos & 7)));
}
--
2.7.4
id=66395a6157e573450c691f4fe8fecec4dee8d5f7&showmsg=1'>Expand)| Author |
| 2016-02-16 | gnu: gpsbabel: Use 'modify-phases'....* gnu/packages/gps.scm (gpsbabel)[arguments]: Use 'modify-phases'.
| Efraim Flashner |
| 2016-02-16 | gnu: gpsbabel: Update to 1.5.2....* gnu/packages/gps.scm (gpsbabel): Update to 1.5.2.
[inputs]: Remove qt-4, add qt.
| Efraim Flashner |
| 2015-03-04 | gnu: Move 'which' to (gnu packages base)....* gnu/packages/which.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/base.scm (which): New variable.
* gnu/packages/aspell.scm, gnu/packages/audio.scm,
gnu/packages/autogen.scm, gnu/packages/cdrom.scm,
gnu/packages/compression.scm, gnu/packages/datamash.scm,
gnu/packages/games.scm, gnu/packages/glib.scm,
gnu/packages/gnu-pw-mgr.scm, gnu/packages/gnutls.scm,
gnu/packages/gps.scm, gnu/packages/guile.scm,
gnu/packages/java.scm, gnu/packages/libevent.scm,
gnu/packages/linux.scm, gnu/packages/lisp.scm,
gnu/packages/node.scm, gnu/packages/ntp.scm,
gnu/packages/orpheus.scm, gnu/packages/pciutils.scm,
gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/rsync.scm, gnu/packages/sawfish.scm,
gnu/packages/scheme.scm, gnu/packages/ssh.scm,
gnu/packages/statistics.scm, gnu/packages/texlive.scm,
gnu/packages/wdiff.scm: Adjust accordingly.
| Ludovic Courtès |
| 2014-12-27 | gnu: libxml2: Add search path specification....* gnu/packages/xml.scm (libxml2)[native-search-paths, search-paths]: New
fields.
* gnu/packages/gnome.scm (gnome-doc-utils)[arguments]: Remove.
* gnu/packages/gps.scm (gpscorrelate)[arguments]: Remove settings for
'XML_CATALOG_FILES' from 'configure' phase.
* gnu/packages/web.scm (tinyproxy)[arguments]: Likewise.
| Ludovic Courtès |
| 2014-10-31 | gnu: gpsbabel: Correctly unquote the value for #:tests?....* gnu/packages/gps.scm (gpsbabel)[arguments]: Add missing unquote.
Fixes typo introduced in 8235039.
| Ludovic Courtès |
| 2014-10-30 | gnu: gpsbabel: Disable tests on i686....* gnu/packages/gps.scm (gpsbabel)[arguments]: Add #:tests?.
| Ludovic Courtès |
| 2014-10-29 | gnu: Add GPS Correlate....* gnu/packages/gps.scm (gpscorrelate): New variable.
| Ludovic Courtès |
| 2014-10-29 | gnu: Add GPSBabel....* gnu/packages/gps.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
| Ludovic Courtès |