Skip to content

[pull] master from ruby:master #808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Feb 26, 2026
+12 −4
Merged

[pull] master from ruby:master #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
319de3c
git must in in the source tree instead of the build directory
nobu Feb 26, 2026
3a7f3cf
[ruby/openssl] Fix missing error check on BIO_get_mem_ptr()
ndossche Feb 25, 2026
64fdfb7
[ruby/openssl] Fix memory leak if sk_push fails
ndossche Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions defs/gmake.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ pull-github: fetch-github
$(call pull-github,$(PR))

define pull-github
$(eval GITHUB_MERGE_BASE := $(shell $(GIT) rev-parse HEAD)
$(eval GITHUB_MERGE_BASE := $(shell $(GIT_IN_SRC) rev-parse HEAD)
$(eval GITHUB_MERGE_BRANCH := $(shell $(GIT_IN_SRC) symbolic-ref --short HEAD))
$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(1)-XXXXXX"))
$(GIT_IN_SRC) worktree prune
Expand Down Expand Up @@ -434,7 +434,7 @@ ifneq ($(DOT_WAIT),)
endif

ifeq ($(HAVE_GIT),yes)
REVISION_LATEST := $(shell $(GIT) rev-parse HEAD)
REVISION_LATEST := $(shell $(GIT_IN_SRC) rev-parse HEAD)
else
REVISION_LATEST := update
endif
Expand Down
6 changes: 5 additions & 1 deletion ext/openssl/ossl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ ossl_##name##_ary2sk0(VALUE ary) \
" of class ##type##"); \
} \
x = dup(val); /* NEED TO DUP */ \
sk_##type##_push(sk, x); \
if (!sk_##type##_push(sk, x)) { \
type##_free(x); \
sk_##type##_pop_free(sk, type##_free); \
ossl_raise(eOSSLError, NULL); \
} \
} \
return (VALUE)sk; \
} \
Expand Down
6 changes: 5 additions & 1 deletion ext/openssl/ossl_bio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ ossl_membio2str(BIO *bio)
int state;
BUF_MEM *buf;

BIO_get_mem_ptr(bio, &buf);
if (BIO_get_mem_ptr(bio, &buf) <= 0) {
BIO_free(bio);
ossl_raise(eOSSLError, "BIO_get_mem_ptr");
}

ret = ossl_str_new(buf->data, buf->length, &state);
BIO_free(bio);
if (state)
Expand Down