| author | osayama <osamu.sayama@oracle.com> |
| Tue, 24 Mar 2015 17:03:41 -0700 | |
| branch | s11-update |
| changeset 4015 | 3592adaad446 |
| permissions | -rw-r--r-- |
|
4015
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
1 |
This patch comes from in-house and has been submitted upstream: |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
2 |
http://savannah.gnu.org/bugs/?44018 |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
3 |
|
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
4 |
--- groff-1.22.2/src/roff/troff/env.cpp.org 2013-02-07 21:06:06.000000000 +0900 |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
5 |
+++ groff-1.22.2/src/roff/troff/env.cpp 2015-01-14 10:23:07.817142586 +0900 |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
6 |
@@ -2110,6 +2110,9 @@ |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
7 |
} |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
8 |
distribute_space(pre, bp->nspaces, extra_space_width); |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
9 |
hunits output_width = bp->width + extra_space_width; |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
10 |
+ if (output_width <= 0) |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
11 |
+ return; |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
12 |
+ |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
13 |
input_line_start -= output_width; |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
14 |
if (bp->hyphenated) |
|
3592adaad446
18934703 gtroff hangs in environment::possibly_break_line with -mja
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
15 |
hyphen_line_count++; |