Skip to content
Permalink
Browse files
8263362: Avoid division by 0 in java/awt/font/TextJustifier.java justify
Reviewed-by: psadhukhan
  • Loading branch information
MBaesken committed May 6, 2021
1 parent 0f9852c commit ea30bd6684fa3003889062a129a5aee1bc9b0024
Showing with 6 additions and 3 deletions.
  1. +6 −3 src/java.desktop/share/classes/java/awt/font/TextJustifier.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -155,10 +155,13 @@
boolean absorbing = hitLimit && absorbweight > 0;

// predivide delta by weight
float weightedDelta = delta / weight; // not used if weight == 0
float weightedDelta = 0;
if (weight != 0) { // not used if weight == 0
weightedDelta = delta / weight;
}

float weightedAbsorb = 0;
if (hitLimit && absorbweight > 0) {
if (hitLimit && absorbweight != 0) {
weightedAbsorb = (delta - gslimit) / absorbweight;
}

3 comments on commit ea30bd6

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot replied May 6, 2021

@MBaesken

This comment has been minimized.

Copy link
Member Author

@MBaesken MBaesken replied Aug 31, 2021

/backport jdk11u-dev

@openjdk

This comment has been minimized.

Copy link

@openjdk openjdk bot replied Aug 31, 2021

@MBaesken the backport was successfully created on the branch MBaesken-backport-ea30bd66 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit ea30bd66 from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 6 May 2021 and was reviewed by Prasanta Sadhukhan.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev MBaesken-backport-ea30bd66:MBaesken-backport-ea30bd66
$ git checkout MBaesken-backport-ea30bd66
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev MBaesken-backport-ea30bd66
Please sign in to comment.