From 1d4cd359c5b2910cca425d143d754eff423321f8 Mon Sep 17 00:00:00 2001 From: dmitry Date: Fri, 7 Aug 2009 10:47:16 +0000 Subject: [PATCH] carbon: make GetClipRGN safer git-svn-id: trunk@21132 - --- lcl/interfaces/carbon/carboncanvas.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lcl/interfaces/carbon/carboncanvas.pp b/lcl/interfaces/carbon/carboncanvas.pp index 689ad7e6cd..8afb4cc064 100644 --- a/lcl/interfaces/carbon/carboncanvas.pp +++ b/lcl/interfaces/carbon/carboncanvas.pp @@ -1487,7 +1487,9 @@ end; function TCarbonDeviceContext.CopyClipRegion(ADstRegion: TCarbonRegion): Integer; begin - Result := ADstRegion.CombineWith(FClipRegion, RGN_COPY); + if Assigned(ADstRegion) + then Result := ADstRegion.CombineWith(FClipRegion, RGN_COPY) + else Result := LCLType.Error; end; { TCarbonScreenContext }