Commit 8125388d authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Try to work around segfaults on Solaris if NULL is passed for outbuf...

Wed Mar 20 18:20:21 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/gconvert.c (open_converter): Try to work around segfaults
        on Solaris if NULL is passed for outbuf... supposedly gchar
        *outbuf = NULL... &outbuf works. (#74336, Lauri Alanko)
parent eccf6b57
Wed Mar 20 18:20:21 2002 Owen Taylor <otaylor@redhat.com>
* glib/gconvert.c (open_converter): Try to work around segfaults
on Solaris if NULL is passed for outbuf... supposedly gchar
*outbuf = NULL... &outbuf works. (#74336, Lauri Alanko)
Wed Mar 20 11:17:32 2002 Owen Taylor <otaylor@redhat.com>
* glib/gfileutils.c (get_contents_regfile): Close the
......
Wed Mar 20 18:20:21 2002 Owen Taylor <otaylor@redhat.com>
* glib/gconvert.c (open_converter): Try to work around segfaults
on Solaris if NULL is passed for outbuf... supposedly gchar
*outbuf = NULL... &outbuf works. (#74336, Lauri Alanko)
Wed Mar 20 11:17:32 2002 Owen Taylor <otaylor@redhat.com>
* glib/gfileutils.c (get_contents_regfile): Close the
......
Wed Mar 20 18:20:21 2002 Owen Taylor <otaylor@redhat.com>
* glib/gconvert.c (open_converter): Try to work around segfaults
on Solaris if NULL is passed for outbuf... supposedly gchar
*outbuf = NULL... &outbuf works. (#74336, Lauri Alanko)
Wed Mar 20 11:17:32 2002 Owen Taylor <otaylor@redhat.com>
* glib/gfileutils.c (get_contents_regfile): Close the
......
Wed Mar 20 18:20:21 2002 Owen Taylor <otaylor@redhat.com>
* glib/gconvert.c (open_converter): Try to work around segfaults
on Solaris if NULL is passed for outbuf... supposedly gchar
*outbuf = NULL... &outbuf works. (#74336, Lauri Alanko)
Wed Mar 20 11:17:32 2002 Owen Taylor <otaylor@redhat.com>
* glib/gfileutils.c (get_contents_regfile): Close the
......
Wed Mar 20 18:20:21 2002 Owen Taylor <otaylor@redhat.com>
* glib/gconvert.c (open_converter): Try to work around segfaults
on Solaris if NULL is passed for outbuf... supposedly gchar
*outbuf = NULL... &outbuf works. (#74336, Lauri Alanko)
Wed Mar 20 11:17:32 2002 Owen Taylor <otaylor@redhat.com>
* glib/gfileutils.c (get_contents_regfile): Close the
......
Wed Mar 20 18:20:21 2002 Owen Taylor <otaylor@redhat.com>
* glib/gconvert.c (open_converter): Try to work around segfaults
on Solaris if NULL is passed for outbuf... supposedly gchar
*outbuf = NULL... &outbuf works. (#74336, Lauri Alanko)
Wed Mar 20 11:17:32 2002 Owen Taylor <otaylor@redhat.com>
* glib/gfileutils.c (get_contents_regfile): Close the
......
Wed Mar 20 18:20:21 2002 Owen Taylor <otaylor@redhat.com>
* glib/gconvert.c (open_converter): Try to work around segfaults
on Solaris if NULL is passed for outbuf... supposedly gchar
*outbuf = NULL... &outbuf works. (#74336, Lauri Alanko)
Wed Mar 20 11:17:32 2002 Owen Taylor <otaylor@redhat.com>
* glib/gfileutils.c (get_contents_regfile): Close the
......
......@@ -354,11 +354,19 @@ open_converter (const gchar *to_codeset,
}
else
{
/* Apparently iconv on Solaris <= 7 segfaults if you pass in
* NULL for anything but inbuf; work around that. (NULL outbuf
* or NULL *outbuf is allowed by Unix98.)
*/
gint inbytes_left = 0;
gchar *outbuf = NULL;
gint outbytes_left = 0;
cd = bucket->cd;
bucket->used = TRUE;
/* reset the descriptor */
g_iconv (cd, NULL, NULL, NULL, NULL);
g_iconv (cd, NULL, &inbytes_left, &outbuf, &outbytes_left);
}
bucket->refcount++;
......
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