OpenSystemsDevelopment / qpdf

Commit 529501aa41066cd99b918dfc014ad512a68d6395

Authored by m-holger
Committed by GitHub
2 parents 638bf5f9 43a88e1d

Merge pull request #1293 from m-holger/pr1287 

Tweak #1287 comments
Inline Side-by-side
Showing 3 changed files with 9 additions and 7 deletions
ChangeLog
  View file @529501a
1 1 2024-09-20 Chao Li <mslichao@outlook.com>
2 2  
3   - * Add C API qpdf_oh_free_buffer to release memory allocated by
4   - stream data functions.
  3 + * Add C API function qpdf_oh_free_buffer to release memory allocated
  4 + by stream data functions.
5 5  
6 6 2024-08-25 M Holger <m.holger@qpdf.org>
7 7  
... ...
include/qpdf/qpdf-c.h
  View file @529501a
... ... @@ -927,10 +927,11 @@ extern &quot;C&quot; {
927 927 QPDF_ERROR_CODE qpdf_oh_get_page_content_data(
928 928 qpdf_data qpdf, qpdf_oh page_oh, unsigned char** bufp, size_t* len);
929 929  
930   - /* Call free to release the buffer allocated with malloc. This function can be used to free
931   - * buffers that were dynamically allocated by qpdf functions such as qpdf_oh_get_stream_data
932   - * or qpdf_oh_get_page_content_data. The caller is responsible for calling qpdf_oh_free_buffer
933   - * to manage memory properly and avoid memory leaks.
  930 + /* Call free to release a buffer allocated with malloc. This function can be used to free
  931 + * buffers that were dynamically allocated by qpdf functions such as qpdf_oh_get_stream_data or
  932 + * qpdf_oh_get_page_content_data. The caller is responsible for calling qpdf_oh_free_buffer (or
  933 + * calling free directly) to manage memory properly and avoid memory leaks. This function has no
  934 + * equivalent in the C++ API.
934 935 */
935 936 QPDF_DLL
936 937 void qpdf_oh_free_buffer(unsigned char** bufp);
... ...
qpdf/qpdf-ctest.c
  View file @529501a
... ... @@ -1152,6 +1152,7 @@ test38(char const* infile, char const* password, char const* outfile, char const
1152 1152 assert(len == 53);
1153 1153 assert(((int)buf[0] == 'x') && ((int)buf[1] == 0234));
1154 1154 qpdf_oh_free_buffer(&buf);
  1155 + assert(!buf);
1155 1156  
1156 1157 /* Test whether filterable */
1157 1158 QPDF_BOOL filtered = QPDF_FALSE;
... ... @@ -1169,7 +1170,7 @@ test38(char const* infile, char const* password, char const* outfile, char const
1169 1170 assert(qpdf_oh_get_page_content_data(qpdf, page2, &buf2, &len) == 0);
1170 1171 assert(len == 47);
1171 1172 assert(memcmp(buf, buf2, len) == 0);
1172   - qpdf_oh_free_buffer(&buf);
  1173 + free(buf);
1173 1174 qpdf_oh_free_buffer(&buf2);
1174 1175  
1175 1176 /* errors */
... ...