Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release memory when replacing drawing wand #633

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Release memory when replacing drawing wand #633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions imagickdraw_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,10 @@ PHP_METHOD(ImagickDraw, setFillColor)
*/
PHP_METHOD(ImagickDraw, setResolution)
{
char *density, *buf = NULL;
#if MagickLibVersion < 0x693
char *density = NULL;
#endif
char *buf = NULL;
double x, y;
php_imagickdraw_object *internd;
DrawInfo *draw_info;
Expand All @@ -349,23 +352,32 @@ PHP_METHOD(ImagickDraw, setResolution)
internd = Z_IMAGICKDRAW_P(getThis());

spprintf(&buf, 512, "%fx%f", x, y);

draw_info = PeekDrawingWand(internd->drawing_wand);
#if MagickLibVersion >= 0x693
d_wand = AcquireDrawingWand(draw_info, NULL);

if (!DrawSetDensity(d_wand, buf)) {
efree (buf);
php_imagick_throw_exception(IMAGICKDRAW_CLASS, "Failed to SetDensity" TSRMLS_CC);
RETURN_THROWS();
}
#else
density = AcquireString(buf);
efree (buf);

if (!density) {
efree (buf);
php_imagick_throw_exception(IMAGICKDRAW_CLASS, "Failed to allocate memory" TSRMLS_CC);
return;
RETURN_THROWS();
}

draw_info = PeekDrawingWand(internd->drawing_wand);
draw_info->density = density;

draw_info->density = density;

#if MagickLibVersion >= 0x693
d_wand = AcquireDrawingWand(draw_info, NULL);
#else
d_wand = (DrawingWand *) DrawAllocateWand(draw_info, NULL);
#endif
efree (buf);
draw_info=DestroyDrawInfo(draw_info);

if (!d_wand) {
php_imagick_throw_exception(IMAGICKDRAW_CLASS, "Failed to allocate new DrawingWand structure" TSRMLS_CC);
Expand Down
Loading