Port the security fixes to Windows. Thanks to PXEGeek for much patience and testing...

[synfig.git] / synfig-core / trunk / src / modules / mod_ffmpeg / mptr_ffmpeg.cpp

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
index f1f7e0b..827a527 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -35,7 +35,18 @@
 #include "mptr_ffmpeg.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/wait.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 <iostream>
 #include <algorithm>
@@ -49,6 +60,12 @@ using namespace synfig;
 using namespace std;
 using namespace etl;
 
+#if defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID)
+ #define UNIX_PIPE_TO_PROCESSES
+#elif defined(HAVE__SPAWNLP) && defined(HAVE__PIPE) && defined(HAVE_CWAIT)
+ #define WIN32_PIPE_TO_PROCESSES
+#endif
+
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_IMPORTER_INIT(ffmpeg_mptr);
@@ -68,9 +85,67 @@ ffmpeg_mptr::seek_to(int frame)
                {
                        fclose(file);
                        int status;
-                       waitpid(pid,&status,0);
+#if defined(WIN32_PIPE_TO_PROCESSES)
+               cwait(&status,pid,0);
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+               waitpid(pid,&status,0);
+#endif
                }
 
+#if defined(WIN32_PIPE_TO_PROCESSES)
+
+       int p[2];
+       int stdin_fileno, stdout_fileno;
+
+       if(_pipe(p, 512, O_BINARY | O_NOINHERIT) < 0) {
+               cerr<<"Unable to open pipe to ffmpeg"<<endl;
+               return false;
+       }
+
+       // Save stdin/stdout so we can restore them later
+       stdin_fileno  = _dup(_fileno(stdin));
+       stdout_fileno = _dup(_fileno(stdout));
+
+       // ffmpeg should write to the pipe
+       if(_dup2(p[1], _fileno(stdout)) != 0) {
+               cerr<<"Unable to open pipe to ffmpeg"<<endl;
+               return false;
+       }
+
+       /*
+       ffmpeg accepts the input filename on the command-line
+       if(_dup2(_fileno(input), _fileno(stdin)) != 0) {
+               synfig::error(_("Unable to open pipe to ffmpeg"));
+               return false;
+       }
+       */
+
+       pid = _spawnlp(_P_NOWAIT, "ffmpeg", "ffmpeg", "-i", filename.c_str(), "-an", "-f", "image2pipe", "-vcodec", "ppm", "-", (const char *)NULL);
+       if( pid < 0) {
+               cerr<<"Unable to open pipe to ffmpeg"<<endl;
+               return false;
+       }
+
+       // Restore stdin/stdout
+       if(_dup2(stdin_fileno, _fileno(stdin)) != 0) {
+               cerr<<"Unable to open pipe to ffmpeg"<<endl;
+               return false;
+       }
+       if(_dup2(stdout_fileno, _fileno(stdout)) != 0) {
+               cerr<<"Unable to open pipe to ffmpeg"<<endl;
+               return false;
+       }
+       close(stdin_fileno);
+       close(stdout_fileno);
+
+       // Close the pipe write end - ffmpeg uses it
+       close(p[1]);
+       
+       // We read data from the read end of the pipe
+       file = fdopen(p[0], "rb");
+
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+
                int p[2];
          
                if (pipe(p)) {
@@ -108,6 +183,10 @@ ffmpeg_mptr::seek_to(int frame)
                        file = fdopen(p[0], "rb");
                }
 
+#else
+       #error There are no known APIs for creating child processes
+#endif
+
                if(!file)
                {
                        cerr<<"Unable to open pipe to ffmpeg"<<endl;
@@ -200,7 +279,11 @@ ffmpeg_mptr::~ffmpeg_mptr()
        {
                fclose(file);
                int status;
+#if defined(WIN32_PIPE_TO_PROCESSES)
+               cwait(&status,pid,0);
+#elif defined(UNIX_PIPE_TO_PROCESSES)
                waitpid(pid,&status,0);
+#endif
        }
 #ifdef HAVE_TERMIOS_H
        tcsetattr(0,TCSANOW,&oldtty);