From 3fbfa1885c082b1043970f9c273a9413bce05a83 Mon Sep 17 00:00:00 2001
From: liumiuyong <lmy@meitu.com>
Date: Thu, 9 Apr 2020 17:48:29 +0800
Subject: [PATCH 1/2] FIX: truncate max/min longitude,latitude related
 geo_point (ex:  {180, 85.05112878} )

---
 src/geohash.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/geohash.c b/src/geohash.c
index db5ae025a..de9620b7a 100644
--- a/src/geohash.c
+++ b/src/geohash.c
@@ -206,7 +206,11 @@ int geohashDecodeWGS84(const GeoHashBits hash, GeoHashArea *area) {
 int geohashDecodeAreaToLongLat(const GeoHashArea *area, double *xy) {
     if (!xy) return 0;
     xy[0] = (area->longitude.min + area->longitude.max) / 2;
+    if (xy[0] > GEO_LONG_MAX) xy[0] = GEO_LONG_MAX;
+    if (xy[0] < GEO_LONG_MIN) xy[0] = GEO_LONG_MIN;
     xy[1] = (area->latitude.min + area->latitude.max) / 2;
+    if (xy[1] > GEO_LAT_MAX) xy[1] = GEO_LAT_MAX;
+    if (xy[1] < GEO_LAT_MIN) xy[1] = GEO_LAT_MIN;
     return 1;
 }
 

From 29760b2eb74132566b6eb7ac341c54c50a96ae6a Mon Sep 17 00:00:00 2001
From: Guy Benoish <guy.benoish@redislabs.com>
Date: Sat, 11 Apr 2020 15:05:01 +0300
Subject: [PATCH 2/2] Typo in getTimeoutFromObjectOrReply's error reply

---
 src/timeout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/timeout.c b/src/timeout.c
index bb5999418..7787a049f 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -166,7 +166,7 @@ int getTimeoutFromObjectOrReply(client *c, robj *object, mstime_t *timeout, int
 
     if (unit == UNIT_SECONDS) {
         if (getLongDoubleFromObjectOrReply(c,object,&ftval,
-            "timeout is not an float or out of range") != C_OK)
+            "timeout is not a float or out of range") != C_OK)
             return C_ERR;
         tval = (long long) (ftval * 1000.0);
     } else {