| author | pkidd <patrick.kidd@oracle.com> |
| Wed, 13 Jul 2016 09:31:29 -0700 | |
| branch | s11u3-sru |
| changeset 6406 | 42eff29ff9ca |
| parent 3706 | bd45826ad92c |
| permissions | -rw-r--r-- |
|
3706
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
1 |
Prevent /usr/bin/grops from dumping core with given an invalid argument value |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
2 |
with something such as |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
3 |
|
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
4 |
$ /usr/bin/grops -c a |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
5 |
|
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
6 |
Fix has been submitted upstream: |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
7 |
http://savannah.gnu.org/bugs/?42190 |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
8 |
|
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
9 |
--- groff-1.22.2/src/devices/grops/ps.cpp.orig 2014-04-24 06:01:32.421674773 -0700 |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
10 |
+++ groff-1.22.2/src/devices/grops/ps.cpp 2014-04-24 09:27:56.445423217 -0700 |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
11 |
@@ -1803,7 +1803,7 @@ |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
12 |
break; |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
13 |
case 'c': |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
14 |
if (sscanf(optarg, "%d", &ncopies) != 1 || ncopies <= 0) {
|
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
15 |
- error("bad number of copies `%s'", optarg);
|
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
16 |
+ error("bad number of copies `%1'", optarg);
|
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
17 |
ncopies = 1; |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
18 |
} |
|
bd45826ad92c
PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
19 |
break; |