From 857cdddb3c61a83073570e5ed984bba1a1e1fbf7 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 22 Nov 2022 11:42:22 +0100
Subject: [PATCH] sysutils/gdisk: actually commit the right patch to fix memory
 issue

---
 sysutils/gdisk/files/patch-gptcl.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/sysutils/gdisk/files/patch-gptcl.cc b/sysutils/gdisk/files/patch-gptcl.cc
index 19e73564d9d0..4b89d9c51625 100644
--- a/sysutils/gdisk/files/patch-gptcl.cc
+++ b/sysutils/gdisk/files/patch-gptcl.cc
@@ -1,4 +1,4 @@
---- gptcl.cc.orig	2022-11-22 09:31:13 UTC
+--- gptcl.cc.orig	2022-04-14 23:17:12 UTC
 +++ gptcl.cc
 @@ -71,7 +71,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
     uint64_t low, high, startSector, endSector, sSize, mainTableLBA;
@@ -9,7 +9,7 @@
     PartType typeHelper;
  
     struct poptOption theOptions[] =
-@@ -156,9 +156,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
+@@ -156,12 +156,14 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
  
     // Assume first non-option argument is the device filename....
     device = (char*) poptGetArg(poptCon);
@@ -18,10 +18,14 @@
     poptResetContext(poptCon);
  
 -   if (device != NULL) {
-+   if (devstr.empty()) {
++   if (!devstr.empty()) {
        JustLooking(); // reset as necessary
        BeQuiet(); // Tell called functions to be less verbose & interactive
-       if (LoadPartitions(devstr)) {
+-      if (LoadPartitions((string) device)) {
++      if (LoadPartitions(devstr)) {
+          if ((WhichWasUsed() == use_mbr) || (WhichWasUsed() == use_bsd))
+             saveNonGPT = 0; // flag so we don't overwrite unless directed to do so
+          sSize = GetBlockSize();
 @@ -498,7 +500,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
           cerr << "Error encountered; not saving changes.\n";
           retval = 4;