ncursesw 1.4.13 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8754a10870f91ce6c48d2482fb10d990f0a0429653fa9f5a7bb28f7a077e9608
-  data.tar.gz: 108f8b3f906c2e1355354633acccaed824a1dd70dc1d770f049150f8bf7ea0e6
+  metadata.gz: 016e54ae104b0ef7cd1ccc31450cf6c187028dcc36924ec862f02d79a599d1ef
+  data.tar.gz: 2d9672ed5931baa142638ace9eabf3a32727ed023d69043af0b45c3ac5eee22a
 SHA512:
-  metadata.gz: 762a8a786de43dea665fbecb8a936089d64a84ec20ece8ead5d8d116c93d68f8db88f63814700b813d5348bd37b2e168f1588cd80186afaaec7d5d100cb267c4
-  data.tar.gz: df600969cf72cdb85a4691464aaa0520755acc8dd3f1aa9916c8c013805d20893deb49c3b867ad623dc766d4fd0fddf807f32880eb50222586e05037c3d9a4b7
+  metadata.gz: 8c19f4ccf0c9825e2964f44b12e79f503fcbb95dc7b0b094c43c64b72830d95db5383ee38b6f8c2025ea5c5108b8f5b6d07ae9c4e63829cface34dd06522d68c
+  data.tar.gz: 56c3f55db7386478779bf59c8489967ca4388839c18bba718c85e9ec1e359a8a060743112ff45bbb658a309b7baeb3cb17440d3793d5654165dc1e6dfe5b3e65

data/Changes

@@ -1,3 +1,14 @@
+ncurses-ruby-1.4.14
+ * Fixed segfault when calling tigetstr() for a non-existent capability.
+ * Fixed incorrect binding of wenclose(), mvwgetch(), and add_wch().
+ * Added missing NULL checks for functions which use NULL to signal an error.
+   Avoids a Ruby ArgumentError or segfault in the error cases.
+ * Replaced deprecated Data_Wrap_Struct() with TypedData_Wrap_Struct()
+   to get type checking for passed-in structs and avoid deprecation warnings.
+ * Fixed potential use-after-free for PANEL userptr.
+ * Fixed redefinition of methods when Ncurses.new_term or Ncurses.initscr
+   are called multiple times.
+
 ncurses-ruby-1.4.13
  * Fixed compilation errors under C23 due to unprototyped functions.
 

data/form_wrap.c

@@ -253,6 +253,9 @@ void init_form_opts_constants() {
 /*
  * FIELD wrapper
  */
+static const struct rb_data_type_struct field_rbtype = {
+    .wrap_struct_name = "Ncurses::Form::FIELDTYPE",
+};
 static VALUE wrap_field(FIELD* field)
 {
   if (field == 0) return Qnil;
@@ -261,7 +264,7 @@ static VALUE wrap_field(FIELD* field)
 	 VALUE field_adress  = INT2NUM((long)(field));
 	 VALUE rb_field      = rb_hash_aref(fields_hash, field_adress);
 	 if (rb_field == Qnil) {
-		rb_field = Data_Wrap_Struct(cFIELD, 0, 0, field);
+		rb_field = TypedData_Wrap_Struct(cFIELD, &field_rbtype, field);
 		rb_iv_set(rb_field, "@destroyed", Qfalse);
 		rb_hash_aset(fields_hash, field_adress, rb_field);
 	 }
@@ -276,13 +279,16 @@ static FIELD* get_field(VALUE rb_field)
 	 rb_raise(rb_eRuntimeError, "Attempt to access a destroyed field");
 	 return 0;
   }
-  Data_Get_Struct(rb_field, FIELD, field);
+  TypedData_Get_Struct(rb_field, FIELD, &field_rbtype, field);
   return field;
 }
 
 /*
  * FIELDTYPE wrapper
  */
+static const struct rb_data_type_struct fieldtype_rbtype = {
+    .wrap_struct_name = "Ncurses::Form::FIELDTYPE",
+};
 static VALUE wrap_fieldtype(FIELDTYPE* fieldtype)
 {
   if (fieldtype == NULL) return Qnil;
@@ -291,7 +297,7 @@ static VALUE wrap_fieldtype(FIELDTYPE* fieldtype)
 	 VALUE fieldtype_adress  = INT2NUM((long)(fieldtype));
 	 VALUE rb_fieldtype      = rb_hash_aref(fieldtypes_hash, fieldtype_adress);
 	 if (rb_fieldtype == Qnil) {
-		rb_fieldtype = Data_Wrap_Struct(cFIELDTYPE, 0, 0, fieldtype);
+		rb_fieldtype = TypedData_Wrap_Struct(cFIELDTYPE, &fieldtype_rbtype, fieldtype);
 		rb_iv_set(rb_fieldtype, "@destroyed", Qfalse);
 		rb_hash_aset(fieldtypes_hash, fieldtype_adress, rb_fieldtype);
 	 }
@@ -306,13 +312,16 @@ static FIELDTYPE* get_fieldtype(VALUE rb_fieldtype)
 	 rb_raise(rb_eRuntimeError, "Attempt to access a destroyed fieldtype");
 	 return 0;
   }
-  Data_Get_Struct(rb_fieldtype, FIELDTYPE, fieldtype);
+  TypedData_Get_Struct(rb_fieldtype, FIELDTYPE, &fieldtype_rbtype, fieldtype);
   return fieldtype;
 }
 
 /*
  * FORM wrapper
  */
+static const struct rb_data_type_struct form_rbtype = {
+    .wrap_struct_name = "Ncurses::Form::FORM",
+};
 static VALUE wrap_form(FORM* form)
 {
   if (form == 0) return Qnil;
@@ -321,7 +330,7 @@ static VALUE wrap_form(FORM* form)
 	 VALUE form_adress  = INT2NUM((long)(form));
 	 VALUE rb_form      = rb_hash_aref(forms_hash, form_adress);
 	 if (rb_form == Qnil) {
-		rb_form = Data_Wrap_Struct(cFORM, 0, 0, form);
+		rb_form = TypedData_Wrap_Struct(cFORM, &form_rbtype, form);
 		rb_iv_set(rb_form, "@destroyed", Qfalse);
 		rb_hash_aset(forms_hash, form_adress, rb_form);
 	 }
@@ -336,7 +345,7 @@ static FORM* get_form(VALUE rb_form)
 	 rb_raise(rb_eRuntimeError, "Attempt to access a destroyed form");
 	 return 0;
   }
-  Data_Get_Struct(rb_form, FORM, form);
+  TypedData_Get_Struct(rb_form, FORM, &form_rbtype, form);
   return form;
 }
 
@@ -763,7 +772,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 +1071,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); }

data/menu_wrap.c

@@ -140,6 +140,9 @@ void init_menu_opts_constants(void)
 /*
  * ITEM wrapper
  */
+static const struct rb_data_type_struct item_rbtype = {
+    .wrap_struct_name = "Ncurses::Menu::ITEM",
+};
 static VALUE wrap_item(ITEM *item)
 {
   if (item == 0) return Qnil;
@@ -150,7 +153,7 @@ static VALUE wrap_item(ITEM *item)
 
 	 if (rb_item == Qnil)
 	 {
-		rb_item = Data_Wrap_Struct(cITEM, 0, 0, item);
+		rb_item = TypedData_Wrap_Struct(cITEM, &item_rbtype, item);
 		rb_iv_set(rb_item, "@destroyed", Qfalse);
 		rb_hash_aset(items_hash, item_address, rb_item);
 	 }
@@ -167,7 +170,7 @@ static ITEM *get_item(VALUE rb_item)
 	 rb_raise(rb_eRuntimeError, "Attempt to access a destroyed item");
 	 return 0;
   }
-  Data_Get_Struct(rb_item, ITEM, item);
+  TypedData_Get_Struct(rb_item, ITEM, &item_rbtype, item);
   return item;
 }
 
@@ -175,6 +178,9 @@ static ITEM *get_item(VALUE rb_item)
 /*
  * MENU wrapper
  */
+static const struct rb_data_type_struct menu_rbtype = {
+    .wrap_struct_name = "Ncurses::Menu::MENU",
+};
 static VALUE wrap_menu(MENU *menu)
 {
   if (menu == 0) return Qnil;
@@ -185,7 +191,7 @@ static VALUE wrap_menu(MENU *menu)
 
 	 if (rb_menu == Qnil)
 	 {
-		rb_menu = Data_Wrap_Struct(cMENU, 0, 0, menu);
+		rb_menu = TypedData_Wrap_Struct(cMENU, &menu_rbtype, menu);
 		rb_iv_set(rb_menu, "@destroyed", Qfalse);
 		rb_hash_aset(menus_hash, menu_address, rb_menu);
 	 }
@@ -202,7 +208,7 @@ static MENU *get_menu(VALUE rb_menu)
 	 rb_raise(rb_eRuntimeError, "Attempt to access a destroyed menu");
 	 return 0;
   }
-  Data_Get_Struct(rb_menu, MENU, menu);
+  TypedData_Get_Struct(rb_menu, MENU, &menu_rbtype, menu);
   return menu;
 }
 
@@ -664,7 +670,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); }

data/ncurses_wrap.c

@@ -223,6 +223,9 @@ long rbncurs_array_length(VALUE array)
   return NUM2LONG(rb_funcall(array, rb_intern("length"), 0));
 }
 
+static const struct rb_data_type_struct window_rbtype = {
+    .wrap_struct_name = "Ncurses::WINDOW",
+};
 VALUE   wrap_window(WINDOW* window)
 {
     if (window == 0) return Qnil;
@@ -231,7 +234,7 @@ VALUE   wrap_window(WINDOW* window)
         VALUE window_adress  = INT2NUM((long)(window));
         VALUE rb_window      = rb_hash_aref(windows_hash, window_adress);
         if (rb_window == Qnil) {
-            rb_window = Data_Wrap_Struct(cWINDOW, 0, 0, window);
+            rb_window = TypedData_Wrap_Struct(cWINDOW, &window_rbtype, window);
             rb_iv_set(rb_window, "@destroyed", Qfalse);
             rb_iv_set(rb_window, "@timeout", INT2FIX(-1));
             rb_hash_aset(windows_hash, window_adress, rb_window);
@@ -247,7 +250,7 @@ WINDOW* get_window(VALUE rb_window)
         rb_raise(eNcurses, "Attempt to access a destroyed window");
         return 0;
     }
-    Data_Get_Struct(rb_window, WINDOW, window);
+    TypedData_Get_Struct(rb_window, WINDOW, &window_rbtype, window);
     return window;
 }
 static VALUE rbncurs_delwin(VALUE dummy, VALUE arg1) {
@@ -259,6 +262,9 @@ static VALUE rbncurs_delwin(VALUE dummy, VALUE arg1) {
     return INT2NUM(delwin(window));
 }
 
+static const struct rb_data_type_struct screen_rbtype = {
+    .wrap_struct_name = "Ncurses::SCREEN",
+};
 static VALUE   wrap_screen(SCREEN* screen)
 {
     if (screen == 0) return Qnil;
@@ -267,7 +273,7 @@ static VALUE   wrap_screen(SCREEN* screen)
         VALUE screen_adress  = INT2NUM((long)(screen));
         VALUE rb_screen      = rb_hash_aref(screens_hash, screen_adress);
         if (rb_screen == Qnil) {
-            rb_screen = Data_Wrap_Struct(cSCREEN, 0, 0, screen);
+            rb_screen = TypedData_Wrap_Struct(cSCREEN, &screen_rbtype, screen);
             rb_iv_set(rb_screen, "@destroyed", Qfalse);
             rb_hash_aset(screens_hash, screen_adress, rb_screen);
         }
@@ -282,7 +288,7 @@ static SCREEN* get_screen(VALUE rb_screen)
         rb_raise(eNcurses, "Attempt to access a destroyed screen");
         return 0;
     }
-    Data_Get_Struct(rb_screen, SCREEN, screen);
+    TypedData_Get_Struct(rb_screen, SCREEN, &screen_rbtype, screen);
     return screen;
 }
 #ifdef HAVE_DELSCREEN
@@ -580,8 +586,8 @@ static VALUE rbncurs_addch(VALUE dummy, VALUE arg1) {
 }
 #ifdef HAVE_ADD_WCH
 static VALUE rbncurs_add_wch(VALUE dummy, VALUE arg1) {
-  wchar_t c = NUM2ULONG(arg1);
-  return INT2NUM(add_wch((cchar_t *)&c));
+  cchar_t c = { 0, { NUM2ULONG(arg1), 0 } };
+  return INT2NUM(add_wch(&c));
 }
 #endif
 static VALUE rbncurs_addchnstr(VALUE dummy, VALUE arg1, VALUE arg2) {
@@ -1126,7 +1132,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)));
@@ -1246,10 +1254,10 @@ static VALUE rbncurs_mvwchgat(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3, V
 static VALUE rbncurs_mvwdelch(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3) {
     return INT2NUM(mvwdelch(get_window(arg1),  NUM2INT(arg2),  NUM2INT(arg3)));
 }
-static VALUE rbncurs_mvwgetch(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3) {
-    WINDOW * c_win = get_window(arg1);
-    int windelay = NUM2INT(rb_iv_get(arg1, "@timeout"));
-    if (wmove(c_win, NUM2INT(arg1),  NUM2INT(arg2)) == ERR)
+static VALUE rbncurs_mvwgetch(VALUE dummy, VALUE rb_win, VALUE rb_y, VALUE rb_x) {
+    WINDOW * c_win = get_window(rb_win);
+    int windelay = NUM2INT(rb_iv_get(rb_win, "@timeout"));
+    if (wmove(c_win, NUM2INT(rb_y),  NUM2INT(rb_x)) == ERR)
         return INT2NUM(ERR);
     return INT2NUM(rbncurshelper_nonblocking_wgetch(c_win, windelay));
 }
@@ -1442,7 +1450,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());
@@ -1495,7 +1505,9 @@ static VALUE rbncurs_tigetnum(VALUE dummy, VALUE arg1) {
 #endif
 #ifdef HAVE_TIGETSTR
 static VALUE rbncurs_tigetstr(VALUE dummy, VALUE arg1) {
-    return rb_str_new2(tigetstr(STR2CSTR(arg1)));
+    char * str = tigetstr(STR2CSTR(arg1));
+    if (str == NULL || str == (char *)-1) return Qnil;
+    return rb_str_new2(str);
 }
 #endif
 static VALUE rbncurs_timeout(VALUE dummy, VALUE arg1) {
@@ -2078,7 +2090,6 @@ static void init_functions_2(void) {
     NCFUNC(wvline, 3);
     NCFUNC(color_content, 4);
     NCFUNC(pair_content, 3);
-    NCFUNC(pair_content, 3);
 #ifdef HAVE_GETWIN
     NCFUNC(getwin, 1);
 #endif
@@ -2375,7 +2386,7 @@ static VALUE rbncurs_mousemask(VALUE dummy, VALUE rb_newmask, VALUE rb_oldmask)
 #ifdef HAVE_WENCLOSE
 static VALUE rbncurs_wenclose(VALUE dummy, VALUE rb_win, VALUE rb_y, VALUE rb_x)
 {
-    return wenclose(get_window(rb_win), NUM2INT(rb_y), NUM2INT(rb_y))
+    return wenclose(get_window(rb_win), NUM2INT(rb_y), NUM2INT(rb_x))
         ? Qtrue : Qfalse;
 }
 #endif
@@ -2837,7 +2848,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)
@@ -2881,6 +2896,9 @@ void Init_ncursesw_bin(void)
 }
 static void Init_ncurses_full(void)
 {
+    static bool already_done = false;
+    if (already_done) return;
+
     init_globals_1();
     init_globals_2();
     init_functions_0();
@@ -2898,4 +2916,6 @@ static void Init_ncurses_full(void)
 #if defined(HAVE_MENU_H) || defined(HAVE_NCURSESW_MENU_H)
     init_menu();
 #endif
+
+    already_done = true;
 }

data/panel_wrap.c

@@ -29,6 +29,14 @@
 VALUE mPanel;
 VALUE cPANEL;
 
+static void panel_rb_mark(void * panel) {
+    const void * userptr = panel_userptr((PANEL*)panel);
+    if (userptr != NULL) rb_gc_mark((VALUE)userptr);
+}
+static const struct rb_data_type_struct panel_rbtype = {
+    .wrap_struct_name = "Ncurses::Panel::PANEL",
+    .function.dmark = panel_rb_mark,
+};
 static VALUE wrap_panel(PANEL* panel)
 {
     if (panel == 0) return Qnil;
@@ -37,7 +45,7 @@ static VALUE wrap_panel(PANEL* panel)
         VALUE panel_adress  = INT2NUM((long)(panel));
         VALUE rb_panel      = rb_hash_aref(panels_hash, panel_adress);
         if (rb_panel == Qnil) {
-            rb_panel = Data_Wrap_Struct(cPANEL, 0, 0, panel);
+            rb_panel = TypedData_Wrap_Struct(cPANEL, &panel_rbtype, panel);
             rb_iv_set(rb_panel, "@destroyed", Qfalse);
             rb_hash_aset(panels_hash, panel_adress, rb_panel);
         }
@@ -52,7 +60,7 @@ static PANEL* get_panel(VALUE rb_panel)
         rb_raise(rb_eRuntimeError, "Attempt to access a destroyed panel");
         return 0;
     }
-    Data_Get_Struct(rb_panel, PANEL, panel);
+    TypedData_Get_Struct(rb_panel, PANEL, &panel_rbtype, panel);
     return panel;
 }
 static VALUE rbncurs_c_del_panel(VALUE rb_panel) {

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ncursesw
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.4.14
 platform: ruby
 authors:
 - Tobias Herzke
 - Sup developers
-autorequire:
 bindir: bin
 cert_chain: []
 date: 1980-01-01 00:00:00.000000000 Z
@@ -50,7 +49,6 @@ homepage: http://github.com/sup-heliotrope/ncursesw-ruby
 licenses:
 - LGPL-2.1
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: 'This wrapper provides access to the functions, macros, global variables
   and constants of the ncurses library.  These are mapped to a Ruby Module named "Ncurses":  Functions