naruse	2015-02-19 15:35:44 +0900 (Thu, 19 Feb 2015)

  New Revision: 49645

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49645

  Log:
    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.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ext/sdbm/_sdbm.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ext/sdbm/_sdbm.c
===================================================================
--- ruby_2_2/ext/sdbm/_sdbm.c	(revision 49644)
+++ ruby_2_2/ext/sdbm/_sdbm.c	(revision 49645)
@@ -802,7 +802,7 @@ delpair(char *pag, datum key) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/sdbm/_sdbm.c#L802
 		}
 #else
 #ifdef MEMMOVE
-		memmove(dst, src, m);
+		memmove(dst-m, src-m, m);
 #else
 		while (m--)
 			*--dst = *--src;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49644)
+++ ruby_2_2/version.h	(revision 49645)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49494


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/