[vim/vim] (Try to) gracefully handle out-of-memory in bindtextdomain(). (PR #15116)
cvwillegen
The error return value of bindtextdomain() was not propagated to the original calling script. This implements returning FALSE when the call fails, and TRUE when it succeeds.
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/15116
Commit Summary
- 045c4cf (Try to) gracefully handle out-of-memory in bindtextdomain().
File Changes
(4 files)
- M runtime/doc/builtin.txt (7)
- M src/evalfunc.c (15)
- M src/testdir/test_gettext_cp1251.vim (29)
- M src/testdir/test_gettext_utf8.vim (29)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
zeertzjq
Build failure on macos-14
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Christ van Willegen
Build failure on macos-14
vim-dev ML
> Build failure on macos-14
>
Is the return type on OS-14 different? It gives me a ... weird error.
Expression expected??
The other uses of the function don't check the return value, so I can't see
how it "should" be done.
I propose we don't check the return value. Getting an out of memory error
here looks very unlikely...
Christ van Willegen
>
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
Hm, not sure what is wrong on MacOS. Perhaps change this:
if (bindtextdomain((const char *)argvars[0].vval.v_string, (const char *)argvars[1].vval.v_string) == NULL)
to
if (!bindtextdomain((const char *)argvars[0].vval.v_string, (const char *)argvars[1].vval.v_string))
—
Reply to this email directly, view it on GitHub.
You are receiving this because you commented.
LemonBoy
In this case the check expands to ( == NULL), that's a problem. The macros should expand to some non-null value.
—
Reply to this email directly, view it on GitHub.
You are receiving this because you commented.
cvwillegen
@cvwillegen pushed 1 commit.
- 472540b Make bindtextdomain() return 'something'.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
K.Takata
@k-takata commented on this pull request.
In src/testdir/test_gettext.vim:
> @@ -2,15 +2,17 @@ source check.vim
" Test for gettext()
func Test_gettext()
- call assert_fails('call bindtextdomain("test")', 'E119:')
- call assert_fails('call bindtextdomain("vim", "test")', 'E475:')
+ if has("gettext")
CheckFeature gettext might be better?
—
Reply to this email directly, view it on GitHub.
You are receiving this because you commented.
LemonBoy
@LemonBoy commented on this pull request.
In src/vim.h:
> @@ -598,7 +598,7 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring); # ifdef bindtextdomain # undef bindtextdomain # endif -# define bindtextdomain(x, y) // empty +# define bindtextdomain(x, y) (y)⬇️ Suggested change
-# define bindtextdomain(x, y) (y) +# define bindtextdomain(x, y) ""
This is better as bindtextdomain(<whatever>, NULL) does not return NULL (unless there's something wrong).
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you commented.
cvwillegen
@cvwillegen pushed 1 commit.
- 5da022a Apply feedback from code review.
You are receiving this because you are subscribed to this thread.
Christian Brabandt
thanks!
—
Reply to this email directly, view it on GitHub.
You are receiving this because you commented.
Christian Brabandt
—
Reply to this email directly, view it on GitHub.
You are receiving this because you commented.