summaryrefslogtreecommitdiff
path: root/ghostscript-9.54.0-gdevtxtw-null-also-pointers.patch
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-08-02 07:17:42 +0000
committerCoprDistGit <infra@openeuler.org>2024-08-02 07:17:42 +0000
commit886f76be743b921f03d0cfc79ffc7fecfbbd6a24 (patch)
treeb3b8295d60bb932639f129e49e3418434fac1be4 /ghostscript-9.54.0-gdevtxtw-null-also-pointers.patch
parent20f39c60f91af511a87c17eb3266d46ffb8f4977 (diff)
automatic import of ghostscriptopeneuler24.03_LTSopeneuler23.09
Diffstat (limited to 'ghostscript-9.54.0-gdevtxtw-null-also-pointers.patch')
-rw-r--r--ghostscript-9.54.0-gdevtxtw-null-also-pointers.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/ghostscript-9.54.0-gdevtxtw-null-also-pointers.patch b/ghostscript-9.54.0-gdevtxtw-null-also-pointers.patch
new file mode 100644
index 0000000..90b9859
--- /dev/null
+++ b/ghostscript-9.54.0-gdevtxtw-null-also-pointers.patch
@@ -0,0 +1,46 @@
+diff --git a/devices/vector/gdevtxtw.c b/devices/vector/gdevtxtw.c
+index c6b95ed5b..f103d598b 100644
+--- a/devices/vector/gdevtxtw.c
++++ b/devices/vector/gdevtxtw.c
+@@ -1982,16 +1982,26 @@ textw_text_release(gs_text_enum_t *pte, client_name_t cname)
+ gx_device_txtwrite_t *const tdev = (gx_device_txtwrite_t *) pte->dev;
+
+ /* Free the working buffer where the Unicode was assembled from the enumerated text */
+- if (penum->TextBuffer)
++ if (penum->TextBuffer) {
+ gs_free(tdev->memory, penum->TextBuffer, 1, penum->TextBufferIndex, "txtwrite free temporary text buffer");
+- if (penum->Widths)
++ penum->TextBuffer = NULL;
++ }
++ if (penum->Widths) {
+ gs_free(tdev->memory, penum->Widths, sizeof(float), pte->text.size, "txtwrite free temporary widths array");
+- if (penum->Advs)
++ penum->Widths = NULL;
++ }
++ if (penum->Advs) {
+ gs_free(tdev->memory, penum->Advs, 1, penum->TextBufferIndex, "txtwrite free temporary text buffer");
+- if (penum->GlyphWidths)
++ penum->Advs = NULL;
++ }
++ if (penum->GlyphWidths) {
+ gs_free(tdev->memory, penum->GlyphWidths, 1, penum->TextBufferIndex, "txtwrite free temporary text buffer");
+- if (penum->SpanDeltaX)
++ penum->GlyphWidths = NULL;
++ }
++ if (penum->SpanDeltaX) {
+ gs_free(tdev->memory, penum->SpanDeltaX, 1, penum->TextBufferIndex, "txtwrite free temporary text buffer");
++ penum->SpanDeltaX = NULL;
++ }
+ /* If this is copied away when we complete the text enumeration succesfully, then
+ * we set the pointer to NULL, if we get here with it non-NULL , then there was
+ * an error.
+@@ -2008,6 +2018,7 @@ textw_text_release(gs_text_enum_t *pte, client_name_t cname)
+ if (penum->text_state->FontName)
+ gs_free(tdev->memory, penum->text_state->FontName, 1, penum->TextBufferIndex, "txtwrite free temporary font name copy");
+ gs_free(tdev->memory, penum->text_state, 1, sizeof(penum->text_state), "txtwrite free text state");
++ penum->text_state = NULL;
+ }
+ }
+
+--
+2.17.1