fix buffer

Author: Tieqiong

src/extensions/pdffit2module/PyFileStreambuf.h

@@ -67,16 +67,21 @@ class PyFileStreambuf : public std::streambuf
 
         virtual int_type overflow( int_type c)
         {
-            PyObject* rv;
-            rv = PyObject_CallMethod(py_file, "write", "(s#)", &c, 1);
+            char ch = static_cast<char>(c);
+            PyObject* py_str = PyUnicode_FromStringAndSize(&ch, 1);
+            if (!py_str) { return traits_type::eof(); }
+            PyObject* rv = PyObject_CallMethod(py_file, "write", "O", py_str);
+            Py_DECREF(py_str);
             if (rv)  { Py_DECREF(rv); }
             return c;
         }
 
         virtual std::streamsize xsputn(const char_type* s, std::streamsize n)
         {
-            PyObject* rv;
-            rv = PyObject_CallMethod(py_file, "write", "(s#)", s, n);
+            PyObject* py_str = PyUnicode_DecodeUTF8(s, n, "replace");
+            if (!py_str) { return 0; }
+            PyObject* rv = PyObject_CallMethod(py_file, "write", "O", py_str); 
+            Py_DECREF(py_str);
             if (rv)  { Py_DECREF(rv); }
             return n;
         }

src/extensions/pdffit2module/misc.cc

@@ -2176,15 +2176,14 @@ char pypdffit2_redirect_stdout__name__[] = "redirect_stdout";
 PyObject * pypdffit2_redirect_stdout(PyObject *, PyObject *args)
 {
     // instance of PyFileStreambuf which takes care of redirection
-    PyObject *py_file = 0;
-    int ok = PyArg_ParseTuple(args, "O", &py_file);
-    if (!ok) return 0;
+    PyObject *py_file = nullptr;
+    if (!PyArg_ParseTuple(args, "O", &py_file)) return nullptr;
     // check if py_file has write and flush attributes
     if ( !PyObject_HasAttrString(py_file, "write") ||
 	 !PyObject_HasAttrString(py_file, "flush") )
     {
         PyErr_SetString(PyExc_TypeError, "expected file-like argument");
-        return 0;
+        return nullptr;
     }
     // create py_stdout_streambuf if necessary
     if (!py_stdout_streambuf)
@@ -2195,7 +2194,7 @@ PyObject * pypdffit2_redirect_stdout(PyObject *, PyObject *args)
     // on first redirection we need to assign new ostream to NS_PDFFIT2::pout
     if (NS_PDFFIT2::pout == &std::cout)
     {
-	NS_PDFFIT2::pout = new ostream(py_stdout_streambuf);
+	NS_PDFFIT2::pout = new std::ostream(py_stdout_streambuf);
     }
     Py_INCREF(Py_None);
     return Py_None;