From 3556836fc71e0e7d6a82f979393eeb72ca9752c4 Mon Sep 17 00:00:00 2001 From: Roman Kennke Date: Mon, 18 Apr 2005 20:47:01 +0000 Subject: [PATCH] 2005-04-18 Roman Kennke * java/awt/BorderLayout.java (calcSize): Check for overflow when component sizes are added. From-SVN: r98347 --- libjava/ChangeLog | 5 +++++ libjava/java/awt/BorderLayout.java | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3e9ba57418a..6a96409dc7f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-04-18 Roman Kennke + + * java/awt/BorderLayout.java + (calcSize): Check for overflow when component sizes are added. + 2005-04-18 Robert Schuster * java/awt/AWTEvent.java (toString): Added case diff --git a/libjava/java/awt/BorderLayout.java b/libjava/java/awt/BorderLayout.java index 7a955d38139..284faf0f3aa 100644 --- a/libjava/java/awt/BorderLayout.java +++ b/libjava/java/awt/BorderLayout.java @@ -700,6 +700,10 @@ calcSize(Container target, int what) Dimension cdim = calcCompSize(center, what); int width = edim.width + cdim.width + wdim.width + (hgap * 2); + // check for overflow + if (width < edim.width || width < cdim.width || width < cdim.width) + width = Integer.MAX_VALUE; + if (ndim.width > width) width = ndim.width; if (sdim.width > width) @@ -713,7 +717,13 @@ calcSize(Container target, int what) if (wdim.height > height) height = wdim.height; - height += (ndim.height + sdim.height + (vgap * 2) + ins.top + ins.bottom); + int addedHeight = height + (ndim.height + sdim.height + (vgap * 2) + + ins.top + ins.bottom); + // check for overflow + if (addedHeight < height) + height = Integer.MAX_VALUE; + else + height = addedHeight; return(new Dimension(width, height)); } -- 2.30.2