Attachment #284953 for bug #380987

View | Details | Raw Unified | Return to bug 380987
Collapse All | Expand All

Lines 71-77 Link Here

(-)abiword-2.8.6.orig/src/af/util/xp/ut_png.cpp (-1 / +1 lines)
71	* the normal method of doing things with libpng). REQUIRED unless you	71	* the normal method of doing things with libpng). REQUIRED unless you
72	* set up your own error handlers in the png_create_read_struct() earlier.	72	* set up your own error handlers in the png_create_read_struct() earlier.
73	*/	73	*/
74	if (setjmp(png_ptr->jmpbuf))	74	if (setjmp(png_jmpbuf(png_ptr)))
75	{	75	{
76	/* Free all of the memory associated with the png_ptr and info_ptr */	76	/* Free all of the memory associated with the png_ptr and info_ptr */
77	png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));	77	png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));

Lines 185-191 Link Here

(-)abiword-2.8.6.orig/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp (-2 / +2 lines)
185	/** needed for the stejmp context */	185	/** needed for the stejmp context */
186	UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)	186	UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
187	{	187	{
188	if (setjmp(m_pPNG->jmpbuf))	188	if (setjmp(png_jmpbuf(m_pPNG)))
189	{	189	{
190	DELETEP(m_pPngBB);	190	DELETEP(m_pPngBB);
191	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	191	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
Lines 446-452 Link Here
446	* the normal method of doing things with libpng). REQUIRED unless you	446	* the normal method of doing things with libpng). REQUIRED unless you
447	* set up your own error handlers in the png_create_read_struct() earlier.	447	* set up your own error handlers in the png_create_read_struct() earlier.
448	*/	448	*/
449	if (setjmp(m_pPNG->jmpbuf))	449	if (setjmp(png_jmpbuf(m_pPNG)))
450	{	450	{
451	/* Free all of the memory associated with the png_ptr and info_ptr */	451	/* Free all of the memory associated with the png_ptr and info_ptr */
452	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	452	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);





	/* Clean Up Memory Used */
		
	FREEP(m_pPNGInfo->palette);
	DELETEP(pBB);
	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
   

	 * the normal method of doing things with libpng).  REQUIRED unless you
	 * set up your own error handlers in the png_create_read_struct() earlier.
	 */
	if (setjmp(png_jmpbuf(m_pPNG)))
	{
		/* Free all of the memory associated with the png_ptr and info_ptr */
		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);

	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
	{
		/* Reset error handling for libpng */
		if (setjmp(png_jmpbuf(m_pPNG)))
		{
			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
			return UT_ERROR;

	if (iOffset > m_iOffset) return UT_IE_BOGUSDOCUMENT;

	png_set_PLTE( m_pPNG, m_pPNGInfo, palette, numClrs );
	png_data_freer( m_pPNG, m_pPNGInfo, PNG_DESTROY_WILL_FREE_DATA, PNG_FREE_PLTE );

	return UT_OK;
}

UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
{
	/* Reset error handling for libpng */
	if (setjmp(png_jmpbuf(m_pPNG)))
	{
		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
		return UT_ERROR;

Lines 79-85 Link Here

(-)abiword-2.8.6.orig/plugins/garble/xp/abiword-garble-png.cpp (-1 / +1 lines)
79	png_set_strip_alpha( png_ptr );	79	png_set_strip_alpha( png_ptr );
80	png_set_interlace_handling( png_ptr );	80	png_set_interlace_handling( png_ptr );
81	png_set_bgr( png_ptr );	81	png_set_bgr( png_ptr );
82	rowbytes = info_ptr->rowbytes;	82	rowbytes = png_get_rowbytes(png_ptr, info_ptr);
83	png_destroy_read_struct( &png_ptr, &info_ptr, NULL );	83	png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
84	}	84	}
85		85

Return to bug 380987

Lines 191-197 Link Here

(-)abiword-2.8.6.orig/plugins/bmp/xp/ie_impGraphic_BMP.cpp (-4 / +4 lines)
191		191
192	/* Clean Up Memory Used */	192	/* Clean Up Memory Used */
193		193
194	FREEP(m_pPNGInfo->palette);
195	DELETEP(pBB);	194	DELETEP(pBB);
196	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	195	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
197		196
Lines 313-319 Link Here
313	* the normal method of doing things with libpng). REQUIRED unless you	312	* the normal method of doing things with libpng). REQUIRED unless you
314	* set up your own error handlers in the png_create_read_struct() earlier.	313	* set up your own error handlers in the png_create_read_struct() earlier.
315	*/	314	*/
316	if (setjmp(m_pPNG->jmpbuf))	315	if (setjmp(png_jmpbuf(m_pPNG)))
317	{	316	{
318	/* Free all of the memory associated with the png_ptr and info_ptr */	317	/* Free all of the memory associated with the png_ptr and info_ptr */
319	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	318	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
Lines 332-338 Link Here
332	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)	331	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
333	{	332	{
334	/* Reset error handling for libpng */	333	/* Reset error handling for libpng */
335	if (setjmp(m_pPNG->jmpbuf))	334	if (setjmp(png_jmpbuf(m_pPNG)))
336	{	335	{
337	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	336	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
338	return UT_ERROR;	337	return UT_ERROR;
Lines 365-370 Link Here
365	if (iOffset > m_iOffset) return UT_IE_BOGUSDOCUMENT;	364	if (iOffset > m_iOffset) return UT_IE_BOGUSDOCUMENT;
366		365
367	png_set_PLTE( m_pPNG, m_pPNGInfo, palette, numClrs );	366	png_set_PLTE( m_pPNG, m_pPNGInfo, palette, numClrs );
		367	png_data_freer( m_pPNG, m_pPNGInfo, PNG_DESTROY_WILL_FREE_DATA, PNG_FREE_PLTE );
368		368
369	return UT_OK;	369	return UT_OK;
370	}	370	}
Lines 372-378 Link Here
372	UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)	372	UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
373	{	373	{
374	/* Reset error handling for libpng */	374	/* Reset error handling for libpng */
375	if (setjmp(m_pPNG->jmpbuf))	375	if (setjmp(png_jmpbuf(m_pPNG)))
376	{	376	{
377	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	377	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
378	return UT_ERROR;	378	return UT_ERROR;