1	* configure: Work around ^M handling on cygwin with igncr
2
3	* glib/convert.c, glib/gmem.c: Do not crash when trying to convert
4	a huge file, return NULL instead.
5
6--- glib/gconvert.c.old	2007-01-26 17:16:07.171875000 +0100
7+++ glib/gconvert.c	2007-01-26 17:17:35.812500000 +0100
8@@ -610,7 +610,15 @@ g_convert_with_iconv (const gchar *str,
9
10 		outbuf_size *= 2;
11 		dest = g_realloc (dest, outbuf_size);
12-
13+
14+		if (dest == NULL)
15+		  {
16+		    g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
17+			         _("Error during conversion: %s"),
18+			         g_strerror (errno));
19+		    return NULL;
20+		  }
21+
22 		outp = dest + used;
23 		outbytes_remaining = outbuf_size - used - 1; /* -1 for nul */
24 	      }
25--- glib/gmem.c.orig	2008-04-08 05:47:29.000000000 +0200
26+++ glib/gmem.c	2008-04-17 18:26:07.765625000 +0200
27@@ -171,8 +171,10 @@ g_realloc (gpointer mem,
28       if (mem)
29 	return mem;
30
31+      /*
32       g_error ("%s: failed to allocate %"G_GSIZE_FORMAT" bytes",
33                G_STRLOC, n_bytes);
34+      */
35     }
36
37   if (mem)
38--- configure.old	2009-07-20 17:21:54.661000000 +0200
39+++ configure	2009-07-20 17:22:25.630000000 +0200
40@@ -44575,6 +44575,7 @@ if test "$ac_cs_awk_cr" = "a${ac_cr}b";
41 else
42   ac_cs_awk_cr=$ac_cr
43 fi
44+ac_cs_awk_cr=$ac_cr
45
46 echo 'BEGIN {' >"$tmp/subs1.awk" &&
47 _ACEOF
48