- Make this work on big endian systems too.

- Added an additional malloc() check.

1 files changed, 7 insertions, 0 deletions

diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index 831ae73405..60aac4435d 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -31,7 +31,11 @@
 #include "timelib.h"
 #include "timezonedb.h"
 
+#ifdef WORDS_BIGENDIAN
+#define timelib_conv_int(l) (l)
+#else
 #define timelib_conv_int(l) ((l & 0x000000ff) << 24) + ((l & 0x0000ff00) << 8) + ((l & 0x00ff0000) >> 8) + ((l & 0xff000000) >> 24)
+#endif
 
 static void read_header(char **tzf, timelib_tzinfo *tz)
 {
@@ -90,6 +94,9 @@ static void read_types(char **tzf, timelib_tzinfo *tz)
 	*tzf += sizeof(unsigned char) * 6 * tz->typecnt;
 
 	tz->type = (ttinfo*) malloc(tz->typecnt * sizeof(struct ttinfo));
+	if (!tz->type) {
+		return;
+	}
 
 	for (i = 0; i < tz->typecnt; i++) {
 		j = i * 6;