Skip to content

Avoid implicit declaration of function 'RB_OBJ_UNTRUST' in Ruby 3 #19

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
jeremyevans merged 1 commit into from
Oct 2, 2020
+6 −0
Merged

Avoid implicit declaration of function 'RB_OBJ_UNTRUST' in Ruby 3 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ext/tk/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
##############################################################
require 'mkmf'

$CFLAGS << " -DNO_TAINT" if RUBY_VERSION >= '2.7'

TkLib_Config = {}
TkLib_Config['search_versions'] =
# %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2]
Expand Down
4 changes: 4 additions & 0 deletions ext/tk/tcltklib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,15 @@ int rb_thread_check_trap_pending(void);
#define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i]
#endif

#ifdef NO_TAINT
#define RbTk_OBJ_UNTRUST(x) do {} while (0)
#else
#ifdef OBJ_UNTRUST
#define RbTk_OBJ_UNTRUST(x) do {OBJ_TAINT(x); OBJ_UNTRUST(x);} while (0)
#else
#define RbTk_OBJ_UNTRUST(x) OBJ_TAINT(x)
#endif
#endif
#define RbTk_ALLOC_N(type, n) (type *)ckalloc((int)(sizeof(type) * (n)))

#if defined(HAVE_RB_PROC_NEW) && !defined(RUBY_VM)
Expand Down