procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use xmalloc instead of malloc.

Browse source 
* 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.
This commit is contained in:
Jan D 2011-01-31 07:44:05 +01:00
parent 0832490d44
commit 3370edca83
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lwlib/ChangeLog
View file

@ -1,3 +1,11 @@
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>
* lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference

2
lwlib/lwlib-Xm.c
View file

@ -173,7 +173,7 @@ make_destroyed_instance (char* name,
Boolean pop_up_p)
{
destroyed_instance* instance =
(destroyed_instance*)malloc (sizeof (destroyed_instance));
(destroyed_instance*) xmalloc (sizeof (destroyed_instance));
instance->name = safe_strdup (name);
instance->type = safe_strdup (type);
instance->widget = widget;

2
lwlib/lwlib-utils.c
View file

@ -74,7 +74,7 @@ XtApplyToWidgets (Widget w, XtApplyToWidgetsProc proc, XtPointer arg)
the procedure might add/delete elements, which would lose badly.
*/
int nkids = cw->composite.num_children;
Widget *kids = (Widget *) malloc (sizeof (Widget) * nkids);
Widget *kids = (Widget *) xmalloc (sizeof (Widget) * nkids);
int i;
memcpy ((char *) kids, (char *) cw->composite.children,
sizeof (Widget) * nkids);

10
lwlib/lwlib.c
View file

@ -109,9 +109,7 @@ safe_strdup (const char *s)
{
char *result;
if (! s) return 0;
result = (char *) malloc (strlen (s) + 1);
if (! result)
return 0;
result = (char *) xmalloc (strlen (s) + 1);
strcpy (result, s);
return result;
}
@ -157,7 +155,7 @@ malloc_widget_value (void)
}
else
{
wv = (widget_value *) malloc (sizeof (widget_value));
wv = (widget_value *) xmalloc (sizeof (widget_value));
malloc_cpt++;
}
memset ((void*) wv, 0, sizeof (widget_value));
@ -257,7 +255,7 @@ allocate_widget_info (const char* type,
lw_callback post_activate_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->name = safe_strdup (name);
info->id = id;
@ -299,7 +297,7 @@ static widget_instance *
allocate_widget_instance (widget_info* info, Widget parent, Boolean pop_up_p)
{
widget_instance* instance =
(widget_instance*)malloc (sizeof (widget_instance));
(widget_instance*) xmalloc (sizeof (widget_instance));
memset (instance, 0, sizeof *instance);
instance->parent = parent;
instance->pop_up_p = pop_up_p;