| author | Tomas Kuthan <tomas.kuthan@oracle.com> |
| Wed, 11 Jan 2017 12:12:15 -0800 | |
| changeset 7560 | 9732971b7855 |
| parent 6451 | 680395ed1e35 |
| permissions | -rw-r--r-- |
|
6451
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
1 |
This patch comes from in-house and has been submitted upstream: |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
2 |
https://savannah.gnu.org/bugs/?48433 |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
3 |
|
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
4 |
--- groff-1.22.3/src/libs/libbib/index.cpp.org 2014-11-04 17:38:35.183524522 +0900 |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
5 |
+++ groff-1.22.3/src/libs/libbib/index.cpp 2016-07-07 09:41:11.572149218 +0900 |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
6 |
@@ -158,6 +158,10 @@ |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
7 |
} |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
8 |
mtime = sb.st_mtime; |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
9 |
int size = int(sb.st_size); |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
10 |
+ if (size == 0) {
|
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
11 |
+ error("`%1' is an empty file", name);
|
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
12 |
+ return 0; |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
13 |
+ } |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
14 |
char *addr; |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
15 |
map_addr = mapread(fd, size); |
|
680395ed1e35
23092145 /usr/bin/lkbib dumps core during accessing empty index file due to malloc(0)
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
16 |
if (map_addr) {
|