* eval.c (backtrace): should ignore line 0 frame.

* sprintf.c (rb_f_sprintf): preceding ".." for negative
  hexadecimal numbers should not appear if prec (e.g. %.4) is
  specified.

* compar.c (cmp_eq,cmp_gt,cmp_ge,cmp_lt,cmp_le): "<=>" might
  return nil.  check using rb_cmpint().

* error.c (init_syserr): remove sys_nerr dependency.

* regex.c (re_match): avoid dereferencing if size == 0.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 14 insertions, 7 deletions

diff --git a/sprintf.c b/sprintf.c
index 4a7f8f6090..9019234b58 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -441,8 +441,13 @@ rb_f_sprintf(argc, argv)
 		    }
 		    s = nbuf;
 		    if (v < 0) {
-			strcpy(s, "..");
-			s += 2;
+			if (base == 10) {
+			    rb_warning("negative number for %%u specifier");
+			}
+			else if (!(flags&FPREC)) {
+			    strcpy(s, "..");
+			    s += 2;
+			}
 		    }
 		    sprintf(fbuf, "%%l%c", *p);
 		    sprintf(s, fbuf, v);
@@ -494,8 +499,10 @@ rb_f_sprintf(argc, argv)
 		    remove_sign_bits(++s, base);
 		    val = rb_str_new(0, 3+strlen(s));
 		    t = RSTRING(val)->ptr;
-		    strcpy(t, "..");
-		    t += 2;
+		    if (!(flags&FPREC)) {
+			strcpy(t, "..");
+			t += 2;
+		    }
 		    switch (base) {
 		      case 16:
 			if (s[0] != 'f') strcpy(t++, "f"); break;
@@ -520,7 +527,7 @@ rb_f_sprintf(argc, argv)
 		}
 		if (prec < len) prec = len;
 		width -= prec;
-		if (!(flags&(FZERO|FMINUS)) && s[0] != '.') {
+		if (!(flags&(FZERO|FMINUS)) && v >= 0) {
 		    CHECK(width);
 		    while (width-->0) {
 			buf[blen++] = ' ';
@@ -537,7 +544,7 @@ rb_f_sprintf(argc, argv)
 		if (!(flags & FMINUS)) {
 		    char c = ' ';
 
-		    if (s[0] == '.') {
+		    if (v < 0) {
 			c = '.';
 			if ((flags & FPREC) && prec > len) {
 			    pos = blen;
@@ -554,7 +561,7 @@ rb_f_sprintf(argc, argv)
 		}
 		CHECK(prec - len);
 		while (len < prec--) {
-		    buf[blen++] = s[0]=='.'?'.':'0';
+		    buf[blen++] = v < 0 ? '.' : '0';
 		}
 		CHECK(len);
 		strcpy(&buf[blen], s);