X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_imagemagick%2Fmptr_imagemagick.cpp;h=2860c1f97434413f6e4689fce916294cff52aa4f;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=2a7ff58eeadac6cd09fe5a5cf99382b32a93cdfb;hpb=70bcefce2ab011a11014f36fc129b473cc0bc61e;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
index 2a7ff58..2860c1f 100644
--- a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
@@ -2,8 +2,11 @@
 /*!	\file mptr_imagemagick.cpp
 **	\brief ppm Target Module
 **
+**	$Id$
+**
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -32,6 +35,20 @@
 #include <ETL/stringf>
 #include "mptr_imagemagick.h"
 #include <stdio.h>
+#include <sys/types.h>
+#if HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+#endif
+#if HAVE_IO_H
+ #include <io.h>
+#endif
+#if HAVE_PROCESS_H
+ #include <process.h>
+#endif
+#if HAVE_FCNTL_H
+ #include <fcntl.h>
+#endif
+#include <unistd.h>
 #include <algorithm>
 #include <functional>
 #include <ETL/stringf>
@@ -45,13 +62,19 @@ using namespace synfig;
 using namespace std;
 using namespace etl;
 
+#if defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID)
+ #define UNIX_PIPE_TO_PROCESSES
+#else
+ #define WIN32_PIPE_TO_PROCESSES
+#endif
+
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_IMPORTER_INIT(imagemagick_mptr);
 SYNFIG_IMPORTER_SET_NAME(imagemagick_mptr,"imagemagick");
 SYNFIG_IMPORTER_SET_EXT(imagemagick_mptr,"miff");
 SYNFIG_IMPORTER_SET_VERSION(imagemagick_mptr,"0.1");
-SYNFIG_IMPORTER_SET_CVS_ID(imagemagick_mptr,"$Id: mptr_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $");
+SYNFIG_IMPORTER_SET_CVS_ID(imagemagick_mptr,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -70,16 +93,11 @@ imagemagick_mptr::~imagemagick_mptr()
 }
 
 bool
-imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback *cb)
+imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::ProgressCallback *cb)
 {
 //#define HAS_LIBPNG 1
 
 #if 1
-	if(file)
-		pclose(file);
-
-	string command;
-
 	if(filename.empty())
 	{
 		if(cb)cb->error(_("No file to load"));
@@ -88,19 +106,51 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 	}
 	string temp_file="/tmp/deleteme.png";
 
+#if defined(WIN32_PIPE_TO_PROCESSES)
+
+	if(file)
+		pclose(file);
+
+	string command;
+
 	if(filename.find("psd")!=String::npos)
 		command=strprintf("convert \"%s\" -flatten \"png32:%s\"\n",filename.c_str(),temp_file.c_str());
 	else
 		command=strprintf("convert \"%s\" \"png32:%s\"\n",filename.c_str(),temp_file.c_str());
 
-	synfig::info("command=%s",command.c_str());
-
 	if(system(command.c_str())!=0)
 		return false;
 
-	Importer::Handle importer(Importer::open(temp_file));
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+
+	string output="png32:"+temp_file;
+
+	pid_t pid = fork();
+
+	if (pid == -1) {
+		return false;
+	}
 
-	DEBUGPOINT();
+	if (pid == 0){
+		// Child process
+		if(filename.find("psd")!=String::npos)
+			execlp("convert", "convert", filename.c_str(), "-flatten", output.c_str(), (const char *)NULL);
+		else
+			execlp("convert", "convert", filename.c_str(), output.c_str(), (const char *)NULL);
+		// We should never reach here unless the exec failed
+		return false;
+	}
+
+	int status;
+	waitpid(pid, &status, 0);
+	if( (WIFEXITED(status) && WEXITSTATUS(status) != 0) || !WIFEXITED(status) )
+		return false;
+
+#else
+	#error There are no known APIs for creating child processes
+#endif
+
+	Importer::Handle importer(Importer::open(temp_file));
 
 	if(!importer)
 	{
@@ -109,8 +159,6 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 		return false;
 	}
 
-	DEBUGPOINT();
-
 	if(!importer->get_frame(surface,0,cb))
 	{
 		if(cb)cb->error(_("Unable to get frame from ")+temp_file);
@@ -151,12 +199,13 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 	Surface bleh(surface);
 	surface=bleh;
 
-
 	//remove(temp_file.c_str());
-	DEBUGPOINT();
 	return true;
 
 #else
+
+#error This code contains tempfile and arbitrary shell command execution vulnerabilities
+
 	if(file)
 		pclose(file);
 
@@ -171,7 +220,7 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 
 	command=strprintf("convert \"%s\" -flatten ppm:-\n",filename.c_str());
 
-	file=popen(command.c_str(),"r");
+	file=popen(command.c_str(),POPEN_BINARY_READ_TYPE);
 
 	if(!file)
 	{