commit 4f55077757cf64d7d402983d05964e2a98a6499c
parent 4e4c03b8b720253a90fb6298a8b7857571f8c60d
Author: Dan Callaghan <djc@djc.id.au>
Date: Thu, 8 Oct 2026 21:29:38 +1100
fix missing NULL checks for return values
Diffstat:
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/form_wrap.c b/form_wrap.c
@@ -763,7 +763,9 @@ static VALUE rbncurs_m_set_field_buffer(VALUE dummy, VALUE rb_field, VALUE buf,
static VALUE rbncurs_c_field_buffer(VALUE rb_field, VALUE buffer) {
FIELD* field = get_field(rb_field);
- return rb_str_new2(field_buffer(field, NUM2INT(buffer)));
+ char * str = field_buffer(field, NUM2INT(buffer));
+ if (str == NULL) return Qnil;
+ return rb_str_new2(str);
}
static VALUE rbncurs_m_field_buffer(VALUE dummy, VALUE rb_field, VALUE buffer)
{ return rbncurs_c_field_buffer(rb_field, buffer); }
@@ -1060,7 +1062,9 @@ static VALUE rbncurs_m_form_opts(VALUE dummy, VALUE rb_form)
* form_requestname
*/
static VALUE rbncurs_c_form_request_name(VALUE request) {
- return rb_str_new2(form_request_name(NUM2INT(request)));
+ char * str = form_request_name(NUM2INT(request));
+ if (str == NULL) return Qnil;
+ return rb_str_new2(str);
}
static VALUE rbncurs_m_form_request_name(VALUE dummy, VALUE request)
{ return rbncurs_c_form_request_name(request); }
diff --git a/menu_wrap.c b/menu_wrap.c
@@ -664,7 +664,9 @@ static VALUE rbncurs_m_menu_opts(VALUE dummy, VALUE rb_menu)
*/
static VALUE rbncurs_c_menu_request_name(VALUE request)
{
- return rb_str_new2(menu_request_name(NUM2INT(request)));
+ char *str = menu_request_name(NUM2INT(request));
+ if (str == NULL) return Qnil;
+ return rb_str_new2(str);
}
static VALUE rbncurs_m_menu_request_name(VALUE dummy, VALUE request)
{ return rbncurs_c_menu_request_name(request); }
diff --git a/ncurses_wrap.c b/ncurses_wrap.c
@@ -1126,7 +1126,9 @@ static VALUE rbncurs_is_wintouched(VALUE dummy, VALUE arg1) {
return (is_wintouched(get_window(arg1))) ? Qtrue : Qfalse;
}
static VALUE rbncurs_keyname(VALUE dummy, VALUE arg1) {
- return rb_str_new2(keyname(NUM2INT(arg1)));
+ const char * str = keyname(NUM2INT(arg1));
+ if (str == NULL) return Qnil;
+ return rb_str_new2(str);
}
static VALUE rbncurs_keypad(VALUE dummy, VALUE arg1, VALUE arg2) {
return INT2NUM(keypad(get_window(arg1), RTEST(arg2)));
@@ -1442,7 +1444,9 @@ static VALUE rbncurs_slk_init(VALUE dummy, VALUE arg1) {
return INT2NUM(slk_init(NUM2INT(arg1)));
}
static VALUE rbncurs_slk_label(VALUE dummy, VALUE arg1) {
- return rb_str_new2(slk_label(NUM2INT(arg1)));
+ char * str = slk_label(NUM2INT(arg1));
+ if (str == NULL) return Qnil;
+ return rb_str_new2(str);
}
static VALUE rbncurs_slk_noutrefresh(VALUE dummy) {
return INT2NUM(slk_noutrefresh());
@@ -2839,7 +2843,11 @@ void init_SCREEN_methods(void)
#ifdef HAVE_LOCALE_H
static VALUE rbncurs_setlocale(VALUE dummy, VALUE category, VALUE locale)
-{ return rb_str_new2(setlocale(NUM2INT(category), STR2CSTR(locale)));}
+{
+ char * str = setlocale(NUM2INT(category), STR2CSTR(locale));
+ if (str == NULL) return Qnil;
+ return rb_str_new2(str);
+}
#endif
static void init_safe_functions(void)