Merge pull request #13347 from meeseeksmachine/auto-backport-of-pr-13289-on-v3.0.x

tacaswell · web-flow · commit d316c7454108 · 2019-02-04T14:22:17.000-05:00
Backport PR #13289 on branch v3.0.x (Fix unhandled C++ exception)
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -111,8 +111,10 @@ static int PyAggImagePhoto(ClientData clientdata, Tcl_Interp *interp, int
         destheight = (int)(y2 - y1);
         deststride = 4 * destwidth;
 
-        destbuffer = new agg::int8u[deststride * destheight];
-        if (destbuffer == NULL) {
+        try {
+            destbuffer = new agg::int8u[deststride * destheight];
+        }
+        catch (std::bad_alloc) {
             TCL_APPEND_RESULT(interp, "could not allocate memory", (char *)NULL);
             return TCL_ERROR;
         }
