From acf27d29c6e63f2c6f91d5709c73abdbd9ada372 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Sat, 18 Jan 2025 13:56:25 +0300 Subject: [PATCH 01/24] Fix undefined behavior --- pdfio-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pdfio-common.c b/pdfio-common.c index 0a8b49a..98d0381 100644 --- a/pdfio-common.c +++ b/pdfio-common.c @@ -368,7 +368,7 @@ _pdfioFileSeek(pdfio_file_t *pdf, // I - PDF file if (pdf->mode == _PDFIO_MODE_READ) { // Reading, see if we already have the data we need... - if (whence != SEEK_END && offset >= pdf->bufpos && offset < (pdf->bufpos + pdf->bufend - pdf->buffer)) + if (whence != SEEK_END && offset >= pdf->bufpos && pdf->bufend && offset < (pdf->bufpos + pdf->bufend - pdf->buffer)) { // Yes, seek within existing buffer... pdf->bufptr = pdf->buffer + (offset - pdf->bufpos); From 41ac7a0b4b5291193d553cdf3f18d7e55147479a Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 18 Jan 2025 09:45:29 -0500 Subject: [PATCH 02/24] Changelog. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 325c506..bf5970d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ v1.4.1 - YYYY-MM-DD - Fixed the link libraries for the example source code (Issue #86) - Fixed handling of the Info object (Issue #87) - Fixed opening of PDF files less than 1024 bytes in length (Issue #87) +- Fixed potential `NULL` dereference when reading (Issue #89) v1.4.0 - 2024-12-26 From fca4dbd395579bab5a281a02123a58b130073958 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 23 Jan 2025 13:03:23 -0500 Subject: [PATCH 03/24] Make sure we have license files for the example fonts (Issue #91) --- CHANGES.md | 1 + examples/Roboto-LICENSE.txt | 93 ++++++++++ examples/code128-LICENSE.txt | 339 +++++++++++++++++++++++++++++++++++ examples/code128.ttf | Bin 7884 -> 7932 bytes 4 files changed, 433 insertions(+) create mode 100644 examples/Roboto-LICENSE.txt create mode 100644 examples/code128-LICENSE.txt diff --git a/CHANGES.md b/CHANGES.md index bf5970d..493dde3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ Changes in PDFio v1.4.1 - YYYY-MM-DD ------------------- +- Added license files for the example fonts now bundled with PDFio (Issue #91) - Fixed the link libraries for the example source code (Issue #86) - Fixed handling of the Info object (Issue #87) - Fixed opening of PDF files less than 1024 bytes in length (Issue #87) diff --git a/examples/Roboto-LICENSE.txt b/examples/Roboto-LICENSE.txt new file mode 100644 index 0000000..a417551 --- /dev/null +++ b/examples/Roboto-LICENSE.txt @@ -0,0 +1,93 @@ +Copyright 2011 The Roboto Project Authors (https://github.com/googlefonts/roboto-classic) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/examples/code128-LICENSE.txt b/examples/code128-LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/examples/code128-LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/examples/code128.ttf b/examples/code128.ttf index 92466dcb0d1645dcf9e46d0e07ec5a2fd54e704c..708f88084f5ff330eefdc44a35d51330903de43e 100644 GIT binary patch delta 660 zcmY*WOH30{6g{tO;Wx0@$P8 z&PoeA_MP%-Dmb%FhR;Rmj?8^Pl$txK=1WpB+nM%Rfc?(^i$`8uT8>x8b^~3n$kS(p zA$99#?D@QN;5%9z)CRoFzsc+CyT-@n)i1NQFna=??La!L?J9(-<6h3`sAaeHH`Dkn~eqm^MWOVG}_{3x)d1-1omCjtg zGIMoy?%MVF8xlp1D@kTkyj}X>#1Gm!ttt>fQmP$&G zYobH+3xfXgQMsHi@IgN>3PMPE>RKBT;im%?@Mq=e#$}X|M}dwsNGea7?g(KJi&#Jw Ty~KntNmUs|NaU1s`xvMrk{ub#T7_q7Z64ewB^R5prVG`oFxl}&>J1Z9rSbCN%3bixK+BJ-87uv{ z@7B}#Wbf#L5WZxsn+5G75ovCfSkGD6OeFdH5^PU{tEZ5ko*AgbHbdu}aDugERNMWP zrBB~d>-&Gw*dT52Wb*B#f)!9lK~|wT|7i|I2ItaXcJQU3HF^W)-jDCYj%)Mo$#2 zoIT!gsx9C*4d?1HD>rKuOS&2I>!x7@?ROoI;sN}a82t4*F)VV-iY-zSQ6?ebINp#G ZBubt%8R; From 9e2f3aba10d95d2d31dcc042fb2fed47ac73d97f Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 23 Jan 2025 15:27:22 -0500 Subject: [PATCH 04/24] Fix reading of compressed object streams (Issue #92) --- CHANGES.md | 1 + pdfio-file.c | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 493dde3..bf57e42 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ v1.4.1 - YYYY-MM-DD - Fixed handling of the Info object (Issue #87) - Fixed opening of PDF files less than 1024 bytes in length (Issue #87) - Fixed potential `NULL` dereference when reading (Issue #89) +- Fixed reading of compressed object streams (Issue #92) v1.4.0 - 2024-12-26 diff --git a/pdfio-file.c b/pdfio-file.c index efd9c7d..8625c8e 100644 --- a/pdfio-file.c +++ b/pdfio-file.c @@ -1517,6 +1517,7 @@ load_obj_stream(pdfio_obj_t *obj) // I - Object to load cur_obj, // Current object num_objs = 0; // Number of objects pdfio_obj_t *objs[16384]; // Objects + int count; // Count of objects PDFIO_DEBUG("load_obj_stream(obj=%p(%d))\n", obj, (int)obj->number); @@ -1528,12 +1529,17 @@ load_obj_stream(pdfio_obj_t *obj) // I - Object to load return (false); } + count = (int)pdfioDictGetNumber(pdfioObjGetDict(obj), "N"); + + PDFIO_DEBUG("load_obj_stream: N=%d\n", count); + _pdfioTokenInit(&tb, obj->pdf, (_pdfio_tconsume_cb_t)pdfioStreamConsume, (_pdfio_tpeek_cb_t)pdfioStreamPeek, st); // Read the object numbers from the beginning of the stream... - while (_pdfioTokenGet(&tb, buffer, sizeof(buffer))) + while (count > 0 && _pdfioTokenGet(&tb, buffer, sizeof(buffer))) { // Stop if this isn't an object number... + PDFIO_DEBUG("load_obj_stream: %s\n", buffer); if (!isdigit(buffer[0] & 255)) break; @@ -1556,21 +1562,19 @@ load_obj_stream(pdfio_obj_t *obj) // I - Object to load // Skip offset _pdfioTokenGet(&tb, buffer, sizeof(buffer)); PDFIO_DEBUG("load_obj_stream: %ld at offset %s\n", (long)number, buffer); + + // One less compressed object... + count --; } - if (!buffer[0]) - { - pdfioStreamClose(st); - return (false); - } - - _pdfioTokenPush(&tb, buffer); + PDFIO_DEBUG("load_obj_stream: num_objs=%lu\n", (unsigned long)num_objs); // Read the objects themselves... for (cur_obj = 0; cur_obj < num_objs; cur_obj ++) { if (!_pdfioValueRead(obj->pdf, obj, &tb, &(objs[cur_obj]->value), 0)) { + _pdfioFileError(obj->pdf, "Unable to read compressed object."); pdfioStreamClose(st); return (false); } @@ -1720,7 +1724,7 @@ load_xref( pdfio_stream_t *st; // Stream unsigned char buffer[32]; // Read buffer size_t num_sobjs = 0, // Number of object streams - sobjs[8192]; // Object streams to load + sobjs[16384]; // Object streams to load pdfio_obj_t *current; // Current object if ((number = strtoimax(line, &ptr, 10)) < 1) From dd7ed67ec1ec29e5993fe99497fe0acf739482f4 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 23 Jan 2025 15:34:43 -0500 Subject: [PATCH 05/24] Update makesrcdist to validate CHANGES.md. --- CHANGES.md | 1 - makesrcdist | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index bf57e42..bbaf253 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,6 @@ Changes in PDFio ================ - v1.4.1 - YYYY-MM-DD ------------------- diff --git a/makesrcdist b/makesrcdist index ee68b08..f01b8d1 100755 --- a/makesrcdist +++ b/makesrcdist @@ -29,6 +29,15 @@ if test $(grep AC_INIT configure.ac | awk '{print $2}') != "[$version],"; then exit 1 fi +if test $(head -4 CHANGES.md | tail -1 | awk '{print $1}') != "v$version"; then + echo "Still need to update CHANGES.md version number." + exit 1 +fi +if test $(head -4 CHANGES.md | tail -1 | awk '{print $3}') = "YYYY-MM-DD"; then + echo "Still need to update CHANGES.md release date." + exit 1 +fi + if test $(grep PDFIO_VERSION= configure | awk -F \" '{print $2}') != "$version"; then echo "Still need to run 'autoconf -f'." exit 1 From 6c68b9fa5a11ba44991645af997762463930de24 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 24 Jan 2025 09:56:51 -0500 Subject: [PATCH 06/24] Add URLs and copyrights for Code 128 font and ProPhoto ICC profile (Issue #91) --- examples/code128-LICENSE.txt | 4 ++++ testfiles/iso22028-2-romm-rgb.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/examples/code128-LICENSE.txt b/examples/code128-LICENSE.txt index d159169..a416159 100644 --- a/examples/code128-LICENSE.txt +++ b/examples/code128-LICENSE.txt @@ -1,3 +1,7 @@ +Copyright 2003 Grandzebu, All Rights Reserved + +http://grandzebu.net/informatique/codbar-en/code128.htm + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/testfiles/iso22028-2-romm-rgb.txt b/testfiles/iso22028-2-romm-rgb.txt index e64611a..6f080bc 100644 --- a/testfiles/iso22028-2-romm-rgb.txt +++ b/testfiles/iso22028-2-romm-rgb.txt @@ -1,3 +1,7 @@ +https://www.color.org/chardata/rgb/rommrgb.xalter + +Copyright © 2006 Hewlett-Packard + Terms of use This profile is made available by ICC, and may be copied, distributed, embedded, made, used, and sold without restriction. Altered versions of this profile shall have the original identification and copyright information removed and shall not be misrepresented as the original profile. From cca7383c73142e936aaf42d8acb797562483f760 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 24 Jan 2025 10:43:41 -0500 Subject: [PATCH 07/24] Fix support for UTF-16 string values in dictionaries (Issue #92) Specifically to support Unicode Title and Author values. --- CHANGES.md | 1 + doc/pdfio.3 | 2 +- pdfio-dict.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 129 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index bbaf253..0c657cf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ v1.4.1 - YYYY-MM-DD - Fixed opening of PDF files less than 1024 bytes in length (Issue #87) - Fixed potential `NULL` dereference when reading (Issue #89) - Fixed reading of compressed object streams (Issue #92) +- Fixed reading of UTF-16 string values (Issue #92) v1.4.0 - 2024-12-26 diff --git a/doc/pdfio.3 b/doc/pdfio.3 index 41eeedb..d4325fe 100644 --- a/doc/pdfio.3 +++ b/doc/pdfio.3 @@ -1,4 +1,4 @@ -.TH pdfio 3 "pdf read/write library" "2025-01-17" "pdf read/write library" +.TH pdfio 3 "pdf read/write library" "2025-01-24" "pdf read/write library" .SH NAME pdfio \- pdf read/write library .SH Introduction diff --git a/pdfio-dict.c b/pdfio-dict.c index a559c71..062607d 100644 --- a/pdfio-dict.c +++ b/pdfio-dict.c @@ -465,10 +465,134 @@ pdfioDictGetString(pdfio_dict_t *dict, // I - Dictionary else if (value && value->type == PDFIO_VALTYPE_BINARY && value->value.binary.datalen < 4096) { // Convert binary string to regular string... - char temp[4096]; // Temporary string + char temp[4096], // Temporary string + *tempptr; // Pointer into temporary string + unsigned char *dataptr; // Pointer into the data string - memcpy(temp, value->value.binary.data, value->value.binary.datalen); - temp[value->value.binary.datalen] = '\0'; + if (!(value->value.binary.datalen & 1) && !memcmp(value->value.binary.data, "\377\376", 2)) + { + // Copy UTF-16 BE + int ch; // Unicode character + size_t remaining; // Remaining bytes + + for (dataptr = value->value.binary.data + 2, remaining = value->value.binary.datalen - 2, tempptr = temp; remaining > 1 && tempptr < (temp + sizeof(temp) - 5); dataptr += 2, remaining -= 2) + { + ch = (dataptr[0] << 8) | dataptr[1]; + + if (ch >= 0xd800 && ch <= 0xdbff && remaining > 3) + { + // Multi-word UTF-16 char... + int lch; // Lower bits + + lch = (dataptr[2] << 8) | dataptr[3]; + + if (lch < 0xdc00 || lch >= 0xdfff) + break; + + ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000; + dataptr += 2; + remaining -= 2; + } + else if (ch >= 0xfffe) + { + continue; + } + + if (ch < 128) + { + // ASCII + *tempptr++ = (char)ch; + } + else if (ch < 4096) + { + // 2-byte UTF-8 + *tempptr++ = (char)(0xc0 | (ch >> 6)); + *tempptr++ = (char)(0x80 | (ch & 0x3f)); + } + else if (ch < 65536) + { + // 3-byte UTF-8 + *tempptr++ = (char)(0xe0 | (ch >> 12)); + *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f)); + *tempptr++ = (char)(0x80 | (ch & 0x3f)); + } + else + { + // 4-byte UTF-8 + *tempptr++ = (char)(0xe0 | (ch >> 18)); + *tempptr++ = (char)(0x80 | ((ch >> 12) & 0x3f)); + *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f)); + *tempptr++ = (char)(0x80 | (ch & 0x3f)); + } + } + + *tempptr = '\0'; + } + else if (!(value->value.binary.datalen & 1) && !memcmp(value->value.binary.data, "\376\377", 2)) + { + // Copy UTF-16 LE + int ch; // Unicode character + size_t remaining; // Remaining bytes + + for (dataptr = value->value.binary.data + 2, remaining = value->value.binary.datalen - 2, tempptr = temp; remaining > 1 && tempptr < (temp + sizeof(temp) - 5); dataptr += 2, remaining -= 2) + { + ch = (dataptr[1] << 8) | dataptr[0]; + + if (ch >= 0xd800 && ch <= 0xdbff && remaining > 3) + { + // Multi-word UTF-16 char... + int lch; // Lower bits + + lch = (dataptr[3] << 8) | dataptr[2]; + + if (lch < 0xdc00 || lch >= 0xdfff) + break; + + ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000; + dataptr += 2; + remaining -= 2; + } + else if (ch >= 0xfffe) + { + continue; + } + + if (ch < 128) + { + // ASCII + *tempptr++ = (char)ch; + } + else if (ch < 4096) + { + // 2-byte UTF-8 + *tempptr++ = (char)(0xc0 | (ch >> 6)); + *tempptr++ = (char)(0x80 | (ch & 0x3f)); + } + else if (ch < 65536) + { + // 3-byte UTF-8 + *tempptr++ = (char)(0xe0 | (ch >> 12)); + *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f)); + *tempptr++ = (char)(0x80 | (ch & 0x3f)); + } + else + { + // 4-byte UTF-8 + *tempptr++ = (char)(0xe0 | (ch >> 18)); + *tempptr++ = (char)(0x80 | ((ch >> 12) & 0x3f)); + *tempptr++ = (char)(0x80 | ((ch >> 6) & 0x3f)); + *tempptr++ = (char)(0x80 | (ch & 0x3f)); + } + } + + *tempptr = '\0'; + } + else + { + // Copy as-is... + memcpy(temp, value->value.binary.data, value->value.binary.datalen); + temp[value->value.binary.datalen] = '\0'; + } free(value->value.binary.data); value->type = PDFIO_VALTYPE_STRING; From 4cb4ceaadd2ba97b6cce800790e1ca771bff93b0 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 24 Jan 2025 14:42:41 -0500 Subject: [PATCH 08/24] Update docos with fixed codedoc. --- doc/pdfio.3 | 4 ++-- doc/pdfio.html | 12 ++++++------ doc/pdfio.md | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/pdfio.3 b/doc/pdfio.3 index d4325fe..1c823a1 100644 --- a/doc/pdfio.3 +++ b/doc/pdfio.3 @@ -2074,7 +2074,7 @@ The render_line function adds content from the linefrag_t array to a PDF page. I } .fi .PP -We then loops through the fragments for the current line, drawing checkboxes, images, and text as needed. Whan a hyperlink is present, we add the link to the links array in the docdata_t structure, mapping "@" and "@@" to an internal link corresponding to the linked text: +We then loop through the fragments for the current line, drawing checkboxes, images, and text as needed. When a hyperlink is present, we add the link to the links array in the docdata_t structure, mapping "@" and "@@" to an internal link corresponding to the linked text: .nf if (frag\->url && dd\->num_links < DOCLINK_MAX) @@ -4567,4 +4567,4 @@ typedef enum pdfio_valtype_e pdfio_valtype_t; Michael R Sweet .SH COPYRIGHT .PP -Copyright (c) 2021-2024 by Michael R Sweet +Copyright (c) 2021-2025 by Michael R Sweet diff --git a/doc/pdfio.html b/doc/pdfio.html index 834afce..d80f62c 100644 --- a/doc/pdfio.html +++ b/doc/pdfio.html @@ -1,13 +1,13 @@ -PDFio Programming Manual v1.4.0 +PDFio Programming Manual v1.4.1 - - + +