Commit 3370edca authored by Jan D's avatar Jan D
Browse files

Use xmalloc instead of malloc.

* lwlib-Xm.c (make_destroyed_instance):
* lwlib-utils.c (XtApplyToWidgets):
* lwlib.c (safe_strdup, malloc_widget_value)
(allocate_widget_info, allocate_widget_instance): Use xmalloc
instead of malloc.
parent 0832490d
2011-01-31 Jan Djärv <jan.h.d@swipnet.se>
* lwlib-Xm.c (make_destroyed_instance):
* lwlib-utils.c (XtApplyToWidgets):
* lwlib.c (safe_strdup, malloc_widget_value)
(allocate_widget_info, allocate_widget_instance): Use xmalloc
instead of malloc.
2011-01-25 Werner Meisner <weme24@gmx.net> 2011-01-25 Werner Meisner <weme24@gmx.net>
* lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference
......
...@@ -173,7 +173,7 @@ make_destroyed_instance (char* name, ...@@ -173,7 +173,7 @@ make_destroyed_instance (char* name,
Boolean pop_up_p) Boolean pop_up_p)
{ {
destroyed_instance* instance = destroyed_instance* instance =
(destroyed_instance*)malloc (sizeof (destroyed_instance)); (destroyed_instance*) xmalloc (sizeof (destroyed_instance));
instance->name = safe_strdup (name); instance->name = safe_strdup (name);
instance->type = safe_strdup (type); instance->type = safe_strdup (type);
instance->widget = widget; instance->widget = widget;
......
...@@ -74,7 +74,7 @@ XtApplyToWidgets (Widget w, XtApplyToWidgetsProc proc, XtPointer arg) ...@@ -74,7 +74,7 @@ XtApplyToWidgets (Widget w, XtApplyToWidgetsProc proc, XtPointer arg)
the procedure might add/delete elements, which would lose badly. the procedure might add/delete elements, which would lose badly.
*/ */
int nkids = cw->composite.num_children; int nkids = cw->composite.num_children;
Widget *kids = (Widget *) malloc (sizeof (Widget) * nkids); Widget *kids = (Widget *) xmalloc (sizeof (Widget) * nkids);
int i; int i;
memcpy ((char *) kids, (char *) cw->composite.children, memcpy ((char *) kids, (char *) cw->composite.children,
sizeof (Widget) * nkids); sizeof (Widget) * nkids);
......
...@@ -109,9 +109,7 @@ safe_strdup (const char *s) ...@@ -109,9 +109,7 @@ safe_strdup (const char *s)
{ {
char *result; char *result;
if (! s) return 0; if (! s) return 0;
result = (char *) malloc (strlen (s) + 1); result = (char *) xmalloc (strlen (s) + 1);
if (! result)
return 0;
strcpy (result, s); strcpy (result, s);
return result; return result;
} }
...@@ -157,7 +155,7 @@ malloc_widget_value (void) ...@@ -157,7 +155,7 @@ malloc_widget_value (void)
} }
else else
{ {
wv = (widget_value *) malloc (sizeof (widget_value)); wv = (widget_value *) xmalloc (sizeof (widget_value));
malloc_cpt++; malloc_cpt++;
} }
memset ((void*) wv, 0, sizeof (widget_value)); memset ((void*) wv, 0, sizeof (widget_value));
...@@ -257,7 +255,7 @@ allocate_widget_info (const char* type, ...@@ -257,7 +255,7 @@ allocate_widget_info (const char* type,
lw_callback post_activate_cb, lw_callback post_activate_cb,
lw_callback highlight_cb) lw_callback highlight_cb)
{ {
widget_info* info = (widget_info*)malloc (sizeof (widget_info)); widget_info* info = (widget_info*) xmalloc (sizeof (widget_info));
info->type = safe_strdup (type); info->type = safe_strdup (type);
info->name = safe_strdup (name); info->name = safe_strdup (name);
info->id = id; info->id = id;
...@@ -299,7 +297,7 @@ static widget_instance * ...@@ -299,7 +297,7 @@ static widget_instance *
allocate_widget_instance (widget_info* info, Widget parent, Boolean pop_up_p) allocate_widget_instance (widget_info* info, Widget parent, Boolean pop_up_p)
{ {
widget_instance* instance = widget_instance* instance =
(widget_instance*)malloc (sizeof (widget_instance)); (widget_instance*) xmalloc (sizeof (widget_instance));
memset (instance, 0, sizeof *instance); memset (instance, 0, sizeof *instance);
instance->parent = parent; instance->parent = parent;
instance->pop_up_p = pop_up_p; instance->pop_up_p = pop_up_p;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment