diff options
| author | Karl Berry <karl@freefriends.org> | 2018-10-23 22:43:58 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-10-23 22:43:58 +0000 |
| commit | 68750bb5ebfaf77887385824819f579578b95e70 (patch) | |
| tree | 46559aa34f9f1e6fd54f177d3f3e711deaee1545 /Build/source/texk/web2c/pdftexdir | |
| parent | 84913babd1c16867f2a746fa23f10fe1ab10c329 (diff) | |
avoid possible strlen on null ptr
git-svn-id: svn://tug.org/texlive/trunk@48980 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir')
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/writet1.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index e0a7b5e0ce1..346d7a48bfd 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,9 @@ +2018-10-24 Karl Berry <karl@tug.org> + + * writet1.c (t1_check_unusual_charstring): don't call + strlen(t1_buf_array) if it is null. + From Luigi, 22 Oct 2018 22:43:03. + 2018-10-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * pdftosrc-newpoppler.cc: Add a comment that it works upto diff --git a/Build/source/texk/web2c/pdftexdir/writet1.c b/Build/source/texk/web2c/pdftexdir/writet1.c index 8cfc2616ca3..079ac369d7d 100644 --- a/Build/source/texk/web2c/pdftexdir/writet1.c +++ b/Build/source/texk/web2c/pdftexdir/writet1.c @@ -1,5 +1,5 @@ /* -Copyright 1996-2014 Han The Thanh <thanh@pdftex.org> +Copyright 1996-2018 Han The Thanh <thanh@pdftex.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1598,7 +1598,9 @@ static void t1_check_unusual_charstring(void) *(strend(t1_buf_array) - 1) = ' '; t1_getline(); - alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE); + alloc_array(t1_buf, strlen(t1_line_array) + + (t1_buf_array ? strlen(t1_buf_array) + 1 : 0), + T1_BUF_SIZE); strcat(t1_buf_array, t1_line_array); alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE); strcpy(t1_line_array, t1_buf_array); |