summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-09-25 13:46:29 +0900
committernagachika <nagachika@ruby-lang.org>2022-09-25 13:46:29 +0900
commit89eab8e0bf34ed36f32c1f8c230790f8b23a356f (patch)
tree10ea877ad4bf1de6d1500d209fb52d443a49d9a7
parente3607e687014da4f6347c462e7d11fb67000b733 (diff)
merge revision(s) 7f81f335478a3ca873f34e3bc0af6927819d3e84: [Backport #18734]
Return `false` where sticky-bit is not provided [Bug #18734] --- file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
-rw-r--r--file.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/file.c b/file.c
index 2d0f323406..6a0e84b8d5 100644
--- a/file.c
+++ b/file.c
@@ -2161,7 +2161,7 @@ rb_file_sticky_p(VALUE obj, VALUE fname)
#ifdef S_ISVTX
return check3rdbyte(fname, S_ISVTX);
#else
- return Qnil;
+ return Qfalse;
#endif
}
diff --git a/version.h b/version.h
index 0eeba12939..70ce3a0bcd 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 60
+#define RUBY_PATCHLEVEL 61
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 9