[PATCH] SNet Router Crash fix

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PATCH] SNet Router Crash fix

Stefan Westerfeld
As previously posted, here is the fix for the snet router crash.

Stefan Westerfeld (1):
  BEAST: fix crash: assigning NULL to std::string is an error

 beast-gtk/bstmenus.cc | 2 +-
 beast-gtk/bstmenus.hh | 2 +-
 beast-gtk/bstutils.hh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--
2.7.4

_______________________________________________
beast mailing list
[hidden email]
https://mail.gnome.org/mailman/listinfo/beast
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PATCH] BEAST: fix crash: assigning NULL to std::string is an error

Stefan Westerfeld
Signed-off-by: Stefan Westerfeld <[hidden email]>
---
 beast-gtk/bstmenus.cc | 2 +-
 beast-gtk/bstmenus.hh | 2 +-
 beast-gtk/bstutils.hh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/beast-gtk/bstmenus.cc b/beast-gtk/bstmenus.cc
index 67f189e..1fdb0b5 100644
--- a/beast-gtk/bstmenus.cc
+++ b/beast-gtk/bstmenus.cc
@@ -10,7 +10,7 @@ struct BstChoice {
   Bse::Icon      bseicon;
   String         name;
   void          *p_id;
-  BstChoice() : type_and_flags (BST_CHOICE_TYPE_SEPARATOR), icon_stock_id (NULL), name (NULL), p_id (NULL) {}
+  BstChoice() : type_and_flags (BST_CHOICE_TYPE_SEPARATOR), p_id (NULL) {}
 };
 
 
diff --git a/beast-gtk/bstmenus.hh b/beast-gtk/bstmenus.hh
index b6eedc2..edf7d87 100644
--- a/beast-gtk/bstmenus.hh
+++ b/beast-gtk/bstmenus.hh
@@ -46,7 +46,7 @@ void   bst_choice_destroy  (GtkWidget  *choice);
 #define BST_CHOICE_TEXT(name)            (bst_choice_alloc (BST_CHOICE_TYPE_TEXT, \
     (name), NULL, BST_STOCK_NONE, Bse::Icon()))
 #define BST_CHOICE_SEPERATOR             (bst_choice_alloc (BST_CHOICE_TYPE_SEPARATOR, \
-    NULL, NULL, BST_STOCK_NONE, Bse::Icon()))
+    "", NULL, BST_STOCK_NONE, Bse::Icon()))
 #define BST_CHOICE_END                   (NULL)
 
 
diff --git a/beast-gtk/bstutils.hh b/beast-gtk/bstutils.hh
index ff54a9a..20185af 100644
--- a/beast-gtk/bstutils.hh
+++ b/beast-gtk/bstutils.hh
@@ -181,7 +181,7 @@ BstGMask*       bst_gmask_quick         (GtkWidget     *gmask_container,
 
 
 /* --- stock actions and aliases --- */
-#define BST_STOCK_NONE                  (NULL)
+#define BST_STOCK_NONE                  ("")
 #define BST_STOCK_APPLY                 GTK_STOCK_APPLY
 #define BST_STOCK_CANCEL                GTK_STOCK_CANCEL
 #define BST_STOCK_CDROM                 GTK_STOCK_CDROM
--
2.7.4

_______________________________________________
beast mailing list
[hidden email]
https://mail.gnome.org/mailman/listinfo/beast
Loading...