Michael J Gruber
4 years ago
parent
4c9de2068b
commit
bbe255ff48
@ -1,27 +0,0 @@
|
||||
From a38556c13b132c2e3b275fac0d2e2f0f32895036 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <a38556c13b132c2e3b275fac0d2e2f0f32895036.1590932097.git.mjg@fedoraproject.org>
|
||||
From: Paul Gardiner <paul.gardiner@artifex.com>
|
||||
Date: Tue, 12 May 2020 17:21:18 +0100
|
||||
Subject: [PATCH] Fix possible crash when using openssl for digital signature
|
||||
support.
|
||||
|
||||
---
|
||||
source/helpers/pkcs7/pkcs7-openssl.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c
|
||||
index dfb99bb8c..a0a15fbd5 100644
|
||||
--- a/source/helpers/pkcs7/pkcs7-openssl.c
|
||||
+++ b/source/helpers/pkcs7/pkcs7-openssl.c
|
||||
@@ -606,7 +606,7 @@ static char *x509_get_name_entry_string(fz_context *ctx, X509_NAME *name, int ni
|
||||
int idx = X509_NAME_get_index_by_NID(name, nid, -1);
|
||||
X509_NAME_ENTRY *entry = X509_NAME_get_entry(name, idx);
|
||||
ASN1_STRING *data = X509_NAME_ENTRY_get_data(entry);
|
||||
- return fz_strdup(ctx, (const char *)ASN1_STRING_get0_data(data));
|
||||
+ return data ? fz_strdup(ctx, (const char *)ASN1_STRING_get0_data(data)) : NULL;
|
||||
}
|
||||
|
||||
static pdf_pkcs7_designated_name *x509_designated_name(fz_context *ctx, X509 *x509)
|
||||
--
|
||||
2.27.0.rc1.210.gb37d18b052
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
From 33349b6cebcca0ac9db79177c046fa153c073470 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <33349b6cebcca0ac9db79177c046fa153c073470.1580897265.git.mjg@fedoraproject.org>
|
||||
From: Michael J Gruber <mjg@fedoraproject.org>
|
||||
Date: Wed, 5 Feb 2020 11:07:38 +0100
|
||||
Subject: [PATCH] fix build with gcc 10
|
||||
|
||||
gcc 10 uses -fno-common by default, so that mupdf fails to build: the
|
||||
linker raises "multiple definition" errors the the definitions in
|
||||
fg_gl2.h which were supposed to be declarations. Mark them as such and
|
||||
move the definition to fg_gl2.c.
|
||||
|
||||
Signed-off-by: Michael J Gruber <mjg@fedoraproject.org>
|
||||
---
|
||||
src/fg_gl2.c | 10 ++++++++++
|
||||
src/fg_gl2.h | 14 +++++++-------
|
||||
2 files changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/fg_gl2.c b/src/fg_gl2.c
|
||||
index 38b0acb..a9ccdf1 100644
|
||||
--- a/src/fg_gl2.c
|
||||
+++ b/src/fg_gl2.c
|
||||
@@ -27,6 +27,16 @@
|
||||
#include "fg_internal.h"
|
||||
#include "fg_gl2.h"
|
||||
|
||||
+#ifndef GL_ES_VERSION_2_0
|
||||
+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
+FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
+#endif
|
||||
+
|
||||
void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
|
||||
if (fgStructure.CurrentWindow != NULL)
|
||||
fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
|
||||
diff --git a/src/fg_gl2.h b/src/fg_gl2.h
|
||||
index ab8ba5c..fb3d467 100644
|
||||
--- a/src/fg_gl2.h
|
||||
+++ b/src/fg_gl2.h
|
||||
@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
|
||||
typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
|
||||
typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
|
||||
|
||||
-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
-FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
|
||||
# endif
|
||||
|
||||
--
|
||||
2.25.0.231.gf1b37f75f4
|
||||
|
||||
@ -1 +1 @@
|
||||
SHA512 (mupdf-1.17.0-source.tar.gz) = a049c4dde20d42d4165959c58434a838581413b89afe0c4e72f40dc54097966b995357eece5e81d87b5d64f24c57c5778bc5b9a7b668057d01b736fc17bc3cb3
|
||||
SHA512 (mupdf-1.18.0-rc1-source.tar.gz) = 1ef0fab4bcbb9765d8a264b834e46496e0a1629e56e87b85ec1da826ffd1a10f975f122e0bd180e95530914cd1b2095ec4a113736cc7380dafeb03b1d07d5e06
|
||||
|
||||
Loading…
Reference in new issue