Bug#27230859 UNEXPECTED BEHAVIOUR WHILE HANDLING INVALID

Ajo Robert · Ajo Robert · commit 61c79a78e92c · 2018-02-09T14:39:13.000+05:30
POLYGON

Invalid input polygon can lead to undefined server behaviour.

Fix: Handled the scenario by returning a NULL result.

Change-Id: Icd945f3e8bb493100480605b464f32ef374817e7
diff --git a/sql/gcalc_tools.cc b/sql/gcalc_tools.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -733,7 +733,8 @@ int Gcalc_operation_reducer::end_couple(active_thread *t0, active_thread *t1,
 {
   DBUG_ENTER("Gcalc_operation_reducer::end_couple");
   res_point *rp0, *rp1;
-  DBUG_ASSERT(t1->result_range);
+  if (!t1->result_range)
+    DBUG_RETURN(1);
   if (!(rp0= add_res_point(p)) || !(rp1= add_res_point(p)))
     DBUG_RETURN(1);
   rp0->down= t0->rp;
