From 46ea76c0e977a5176b3d6620148fffe1c5e5e5ec Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Mon, 5 Jun 2023 13:54:26 -0700
Subject: [PATCH] Clean up file handling in main()s, and remove a leak

---
 pycdas.cpp | 24 +++++++++++++-----------
 pycdc.cpp  | 20 +++++++++++---------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/pycdas.cpp b/pycdas.cpp
index cab16d70c..a47f786f4 100644
--- a/pycdas.cpp
+++ b/pycdas.cpp
@@ -3,10 +3,10 @@
 #include <cstdarg>
 #include <string>
 #include <iostream>
+#include <fstream>
 #include "pyc_module.h"
 #include "pyc_numeric.h"
 #include "bytecode.h"
-#include <fstream>
 
 #ifdef WIN32
 #  define PATHSEP '\\'
@@ -265,20 +265,20 @@ int main(int argc, char* argv[])
     bool marshalled = false;
     const char* version = nullptr;
     unsigned disasm_flags = 0;
-    std::ostream &pyc_output = std::cout;
+    std::ostream* pyc_output = &std::cout;
+    std::ofstream out_file;
 
     for (int arg = 1; arg < argc; ++arg) {
         if (strcmp(argv[arg], "-o") == 0) {
             if (arg + 1 < argc) {
                 const char* filename = argv[++arg];
-
-                auto* outfile = new std::filebuf;
-                if(! outfile->open(filename, std::ios::out)) {
+                out_file.open(filename, std::ios_base::out);
+                if (out_file.fail()) {
                     fprintf(stderr, "Error opening file '%s' for writing\n",
-                            argv[arg]);
+                            filename);
                     return 1;
                 }
-                pyc_output.rdbuf(outfile);
+                pyc_output = &out_file;
             } else {
                 fputs("Option '-o' requires a filename\n", stderr);
                 return 1;
@@ -327,7 +327,7 @@ int main(int argc, char* argv[])
             fprintf(stderr, "Error disassembling %s: %s\n", infile, ex.what());
             return 1;
         }
-    }  else {
+    } else {
         if (!version) {
             fputs("Opening raw code objects requires a version to be specified\n", stderr);
             return 1;
@@ -344,10 +344,12 @@ int main(int argc, char* argv[])
     }
     const char* dispname = strrchr(infile, PATHSEP);
     dispname = (dispname == NULL) ? infile : dispname + 1;
-    formatted_print(pyc_output, "%s (Python %d.%d%s)\n", dispname, mod.majorVer(), mod.minorVer(),
-           (mod.majorVer() < 3 && mod.isUnicode()) ? " -U" : "");
+    formatted_print(*pyc_output, "%s (Python %d.%d%s)\n", dispname,
+                    mod.majorVer(), mod.minorVer(),
+                    (mod.majorVer() < 3 && mod.isUnicode()) ? " -U" : "");
     try {
-        output_object(mod.code().try_cast<PycObject>(), &mod, 0, disasm_flags, pyc_output);
+        output_object(mod.code().try_cast<PycObject>(), &mod, 0, disasm_flags,
+                      *pyc_output);
     } catch (std::exception& ex) {
         fprintf(stderr, "Error disassembling %s: %s\n", infile, ex.what());
         return 1;
diff --git a/pycdc.cpp b/pycdc.cpp
index 61fe34238..7bb6bd267 100644
--- a/pycdc.cpp
+++ b/pycdc.cpp
@@ -14,19 +14,20 @@ int main(int argc, char* argv[])
     const char* infile = nullptr;
     bool marshalled = false;
     const char* version = nullptr;
-    std::ostream &pyc_output = std::cout;
+    std::ostream* pyc_output = &std::cout;
+    std::ofstream out_file;
 
     for (int arg = 1; arg < argc; ++arg) {
         if (strcmp(argv[arg], "-o") == 0) {
             if (arg + 1 < argc) {
                 const char* filename = argv[++arg];
-                auto* outfile = new std::filebuf;
-                if(! outfile->open(filename, std::ios::out)) {
+                out_file.open(filename, std::ios_base::out);
+                if (out_file.fail()) {
                     fprintf(stderr, "Error opening file '%s' for writing\n",
-                            argv[arg]);
+                            filename);
                     return 1;
                 }
-                pyc_output.rdbuf(outfile);
+                pyc_output = &out_file;
             } else {
                 fputs("Option '-o' requires a filename\n", stderr);
                 return 1;
@@ -88,11 +89,12 @@ int main(int argc, char* argv[])
     }
     const char* dispname = strrchr(infile, PATHSEP);
     dispname = (dispname == NULL) ? infile : dispname + 1;
-    std::cout << "# Source Generated with Decompyle++\n";
-    formatted_print(pyc_output, "# File: %s (Python %d.%d%s)\n\n", dispname, mod.majorVer(), mod.minorVer(),
-            (mod.majorVer() < 3 && mod.isUnicode()) ? " Unicode" : "");
+    *pyc_output << "# Source Generated with Decompyle++\n";
+    formatted_print(*pyc_output, "# File: %s (Python %d.%d%s)\n\n", dispname,
+                    mod.majorVer(), mod.minorVer(),
+                    (mod.majorVer() < 3 && mod.isUnicode()) ? " Unicode" : "");
     try {
-        decompyle(mod.code(), &mod, pyc_output);
+        decompyle(mod.code(), &mod, *pyc_output);
     } catch (std::exception& ex) {
         fprintf(stderr, "Error decompyling %s: %s\n", infile, ex.what());
         return 1;