kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/print/ghostscript9-agpl-base/files/patch-contrib__gomni.c
Hiroki Sato 27470e1676 - Split ghostscript into X11-independent and -dependent parts: 
* print/ghostscript{7,8,9,9-agpl}-base

   Installs Ghostscript binary, libgs, and related files.
   These ports do not depend on X11 libraries (i.e. x11* devices
   are not available).  USES=ghostscript will set dependency on
   one of them depending on GHOSTSCRIPT_DEFAULT.

   The default device is set to "display" or "bbox".

 * print/ghostscript{7,8,9,9-agpl}-x11

   Installs a shared library which provides X11 support to
   the installed Ghostscript binaries.  x11* devices will be
   enabled when the library is available.

   This depends on *-base (RUN_DEPENDS).  USES=ghostscript:x11
   will set dependency on one of them.

- Fix integer overflow reported as CVE-2015-3228.

- Update Uses/ghostscript.mk:

 * Add x11 keyword.  nox11 keyword is now obsolete.

 * Use packagename in *_DEPENDS line to prevent relationship between
   -base and -x11 packages from being broken.

- Fix x11/nox11 keyword and bump PORTREVISION in ports using
  USES=ghostscript to update dependency of pre-compiled packages.
2015-08-22 17:48:35 +00:00

195 lines
9.2 KiB
C
Raw Blame History

--- contrib/gomni.c.orig 2013-04-28 02:09:12.000000000 +0900
+++ contrib/gomni.c 2013-04-28 02:09:14.000000000 +0900
@@ -530,7 +530,7 @@
&& pDev->pcoreOmni->pszJobOptions
)
{
- gs_free (pDev->memory->non_gc_memory, pDev->pcoreOmni->pszJobOptions, strlen (pDev->pcoreOmni->pszJobOptions) + 1, 1, "Option String");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pDev->pcoreOmni->pszJobOptions, strlen (pDev->pcoreOmni->pszJobOptions) + 1, 1, "Option String");
}
if ( pDev->pcoreOmni
@@ -549,7 +549,7 @@
if (pDev->pcoreOmni)
{
- gs_free (pDev->memory->non_gc_memory, pDev->pcoreOmni, sizeof (core_omni_device), 1, "omni/device");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pDev->pcoreOmni, sizeof (core_omni_device), 1, "omni/device");
pDev->pcoreOmni = 0;
}
@@ -720,7 +720,7 @@
{
PDEVSTRUCT p;
- p = (PDEVSTRUCT)gs_malloc (pgxdev->memory->non_gc_memory, 1, sizeof (Omni_Dev), "omni/instance");
+ p = (PDEVSTRUCT)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, sizeof (Omni_Dev), "omni/instance");
if (!p)
{
dprintf ("<<<<<<<<<<<<<<<<<<<<<< ERROR >>>>>>>>>>>>>>>>>>>>>>>\n\n");
@@ -734,7 +734,7 @@
memset (pDev, 0, sizeof (Omni_Dev));
- pDev->pcoreOmni = (core_omni_device *)gs_malloc (pgxdev->memory->non_gc_memory, 1, sizeof (core_omni_device), "omni/device");
+ pDev->pcoreOmni = (core_omni_device *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, sizeof (core_omni_device), "omni/device");
if (!pDev->pcoreOmni)
{
@@ -783,7 +783,7 @@
for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pDev->hmodOmni; i++)
{
- pszDeviceLib = (char *)gs_malloc (pDev->memory->non_gc_memory, 1,
+ pszDeviceLib = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1,
strlen (cOmnilib)
+ strlen (apszLibraryPaths[i])
+ 1,
@@ -796,7 +796,7 @@
if (fDebugOutput) dprintf2 ("SetupDevice: Trying to load %s = %p\n", pszDeviceLib, pDev->hmodOmni);
}
- gs_free (pDev->memory->non_gc_memory, pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
}
if (!pDev->hmodOmni)
@@ -810,7 +810,7 @@
for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pDev->hmodOmni; i++)
{
- pszDeviceLib = (char *)gs_malloc (pDev->memory->non_gc_memory, 1,
+ pszDeviceLib = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1,
strlen (cOmnilib)
+ strlen (apszLibraryPaths[i])
+ 1,
@@ -830,7 +830,7 @@
g_module_close (pModule);
}
}
- gs_free (pDev->memory->non_gc_memory, pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
}
return 1;
@@ -953,7 +953,7 @@
)
{
if (!pDev->pcoreOmni->pszJobOptions)
- pDev->pcoreOmni->pszJobOptions = (char *)gs_malloc (pDev->memory->non_gc_memory, 1, fname.size + 1, "Option String");
+ pDev->pcoreOmni->pszJobOptions = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, fname.size + 1, "Option String");
memcpy (pDev->pcoreOmni->pszJobOptions, fname.data, fname.size);
pDev->pcoreOmni->pszJobOptions[fname.size] = '\0';
}
@@ -1044,7 +1044,7 @@
for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pModule; i++)
{
- pszDeviceLib = (char *)gs_malloc (pDev->memory->non_gc_memory, 1,
+ pszDeviceLib = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1,
strlen (cDialogName)
+ strlen (apszLibraryPaths[i])
+ 1,
@@ -1059,7 +1059,7 @@
pModule = g_module_open (pszDeviceLib, (GModuleFlags)0);
}
- gs_free (pDev->memory->non_gc_memory, pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
}
if (!pModule)
@@ -1070,7 +1070,7 @@
for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pModule; i++)
{
- pszDeviceLib = (char *)gs_malloc (pDev->memory->non_gc_memory, 1,
+ pszDeviceLib = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1,
strlen (cDialogName)
+ strlen (apszLibraryPaths[i])
+ 1,
@@ -1092,7 +1092,7 @@
g_module_close (pModule);
}
}
- gs_free (pDev->memory->non_gc_memory, pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
}
}
else
@@ -1107,13 +1107,13 @@
if (pDev->pcoreOmni->pszJobOptions)
{
- gs_free (pDev->memory->non_gc_memory, pDev->pcoreOmni->pszJobOptions, strlen (pDev->pcoreOmni->pszJobOptions) + 1, 1, "Option String");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pDev->pcoreOmni->pszJobOptions, strlen (pDev->pcoreOmni->pszJobOptions) + 1, 1, "Option String");
pDev->pcoreOmni->pszJobOptions = 0;
}
iLength = strlen (pszSelectedJobProperties);
- pDev->pcoreOmni->pszJobOptions = (char *)gs_malloc (pDev->memory->non_gc_memory, 1, iLength + 1, "Option String");
+ pDev->pcoreOmni->pszJobOptions = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, iLength + 1, "Option String");
strcpy (pDev->pcoreOmni->pszJobOptions, pszSelectedJobProperties);
@@ -1375,7 +1375,7 @@
iBytesToAlloc += (iNumColors - 1) * sizeof (RGB2);
}
- pbmi = (PBITMAPINFO2)gs_malloc (pDev->memory->non_gc_memory, 1, iBytesToAlloc, "Bmpi Memory");
+ pbmi = (PBITMAPINFO2)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, iBytesToAlloc, "Bmpi Memory");
if (!pbmi)
{
eprintf("<<<<<<<<<<<<<<<<<<<<<< ERROR >>>>>>>>>>>>>>>>>>>>>>>\n\n");
@@ -1481,7 +1481,7 @@
}
}
- pGSData = (byte *)gs_malloc (pDev->memory->non_gc_memory, uiBytesPerLine, 1, "bmp file buffer");
+ pGSData = (byte *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), uiBytesPerLine, 1, "bmp file buffer");
if (pGSData == 0)
/* can't allocate row buffer */
@@ -1501,7 +1501,7 @@
pasyncDev->pDev->iVertDots,
8000*1024); /*eight meg buffer */
- pBitmapMem = (byte *) gs_malloc (pDev->memory->non_gc_memory, 1, uiBytesPerLine * ulBandLength, "Bitmap Memory");
+ pBitmapMem = (byte *) gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, uiBytesPerLine * ulBandLength, "Bitmap Memory");
if(!pBitmapMem)
{
@@ -1613,7 +1613,7 @@
{
if (prtMode.iBitCount < 16)
{
- pMonoData = (byte *)gs_malloc (pDev->memory->non_gc_memory, 1, iYBand * ImageInfo.ulTrgBytesPerLine, "Mono Memory");
+ pMonoData = (byte *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, iYBand * ImageInfo.ulTrgBytesPerLine, "Mono Memory");
if (pMonoData)
{
@@ -1661,7 +1661,7 @@
/* We're done with the mono band */
/* now free up the mono buffer so we can get clean data buffer if more lines are to be */
/* gray-scaled */
- gs_free (pDev->memory->non_gc_memory, (char *)pMonoData, iYBand * ImageInfo.ulTrgBytesPerLine, 1, "Mono Memory");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), (char *)pMonoData, iYBand * ImageInfo.ulTrgBytesPerLine, 1, "Mono Memory");
pMonoData = NULL;
}
@@ -1709,11 +1709,11 @@
done:
- gs_free (pDev->memory->non_gc_memory, (char *) pBitmapMem, uiBytesPerLine * ulBandLength, 1, "Bitmap Memory");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), (char *) pBitmapMem, uiBytesPerLine * ulBandLength, 1, "Bitmap Memory");
dprintf ("Page Completed\n");
- gs_free (pDev->memory->non_gc_memory, (char *)pGSData, uiBytesPerLine, 1, "bmp file buffer");
- gs_free (pDev->memory->non_gc_memory, (char *)pbmi, uiBytesPerLine, 1, "Bpmi Memory");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), (char *)pGSData, uiBytesPerLine, 1, "bmp file buffer");
+ gs_free (gs_lib_ctx_get_non_gc_memory_t(), (char *)pbmi, uiBytesPerLine, 1, "Bpmi Memory");
/******************************************************************/
/* Note: @@08162000 */
Reference in a new issue View git blame Copy permalink