On Sat, Jul 16, 2005 at 01:40:34AM +1000, Peter Moulder wrote:
I'll prepare a patch, and I'll get someone else to review it.
Actually, adding a cast to the result of g_malloc0 seems like a sufficiently safe change that I'll commit now.
Appended is the patch. I've verified in emacs ediff that adding the cast is the only change in each of the changed lines.
pjrm.
Index: cr-utils.c =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/libcroco/cr-utils.c,v retrieving revision 1.2 diff -d -u -p -r1.2 cr-utils.c --- cr-utils.c 7 Jun 2005 15:01:06 -0000 1.2 +++ cr-utils.c 16 Jul 2005 01:05:19 -0000 @@ -725,7 +725,7 @@ cr_utils_utf8_str_to_ucs4 (const guchar
g_return_val_if_fail (status == CR_OK, status);
- *a_out = g_malloc0 (*a_out_len * sizeof (guint32)); + *a_out = (guint32 *) g_malloc0 (*a_out_len * sizeof (guint32));
status = cr_utils_utf8_to_ucs4 (a_in, a_in_len, *a_out, a_out_len);
@@ -971,7 +971,7 @@ cr_utils_ucs1_str_to_utf8 (const guchar
in_len = *a_in_len;
- *a_out = g_malloc0 (out_len); + *a_out = (guchar *) g_malloc0 (out_len);
status = cr_utils_ucs1_to_utf8 (a_in, a_in_len, *a_out, &out_len);
@@ -1172,7 +1172,7 @@ cr_utils_utf8_str_to_ucs1 (const guchar
g_return_val_if_fail (status == CR_OK, status);
- *a_out = g_malloc0 (*a_out_len * sizeof (guint32)); + *a_out = (guchar *) g_malloc0 (*a_out_len * sizeof (guint32));
status = cr_utils_utf8_to_ucs1 (a_in, a_in_len, *a_out, a_out_len); return status;