From ffbc5612926451c42a5904c6ab5449da87b33f32 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 19 Feb 2015 06:35:44 +0000 Subject: merge revision(s) 49494: [Backport #10825] _sdbm.c: fix pointers to shift * ext/sdbm/_sdbm.c (delpair): dst and src point at the ends of each data, whereas memmove requires pointers to the beginnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/sdbm/_sdbm.c | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index b393783ddf..d810befbce 100644 --- a/ext/sdbm/_sdbm.c +++ b/ext/sdbm/_sdbm.c @@ -802,7 +802,7 @@ delpair(char *pag, datum key) } #else #ifdef MEMMOVE - memmove(dst, src, m); + memmove(dst-m, src-m, m); #else while (m--) *--dst = *--src; diff --git a/version.h b/version.h index 088f1a924c..75768320a9 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-02-19" -#define RUBY_PATCHLEVEL 55 +#define RUBY_PATCHLEVEL 56 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 -- cgit v1.2.3