From ac91f3fcfcb69ae5684030d708cd3bee6d73b020 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Wed, 31 May 2023 13:33:26 -0400
Subject: [PATCH] 2023-05-31 Fred Gleason <fredg@paravelsystems.com> 	*
 Fixed a regression in 'RDFormPost' that caused the last character 	of the
 last variable in the post to be truncated when using 
 'application/x-www-form-urlencoded' encoding.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog          |  4 ++++
 lib/rdformpost.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 lib/rdformpost.h   |  2 ++
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8006fbbb..b13b31aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24192,3 +24192,7 @@
 	* Fixed uninitiated variables in rdairplay(1).
 2023-05-30 Fred Gleason <fredg@paravelsystems.com>
 	* Incremented the package version to 4.0.0rc3int1.
+2023-05-31 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a regression in 'RDFormPost' that caused the last character
+	of the last variable in the post to be truncated when using
+	'application/x-www-form-urlencoded' encoding.
diff --git a/lib/rdformpost.cpp b/lib/rdformpost.cpp
index 197c2323..0b62a6a8 100644
--- a/lib/rdformpost.cpp
+++ b/lib/rdformpost.cpp
@@ -414,6 +414,50 @@ QString RDFormPost::headerContentType() const
 }
 
 
+QByteArray RDFormPost::rawPost() const
+{
+  return QByteArray(post_data,post_bytes_downloaded);
+}
+
+
+QString RDFormPost::parsedPost() const
+{
+  QString ret="";
+
+  ret+="<table cellpadding=\"5\" cellspacing=\"0\" border=\"1\">\n";
+  ret+="<tr>\n";
+  ret+="<td colspan=\"3\" align=\"center\"><strong>RDFormPost Data Dump</strong></td>\n";
+  ret+="</tr>\n";
+
+  ret+="<tr>\n";
+  ret+="<th align=\"center\">NAME</th>\n";
+  ret+="<th align=\"center\">VALUE</th>\n";
+  ret+="<th align=\"center\">FILE</th>\n";
+  ret+="</tr>\n";
+
+  for(QMap<QString,QVariant>::const_iterator ci=post_values.begin();
+      ci!=post_values.end();ci++) {
+    ret+="<tr>\n";
+
+    ret+=QString::asprintf("<td align=\"left\">|%s|</td>\n",ci.key().toUtf8().constData());
+    ret+=QString::asprintf("<td align=\"left\">|%s|</td>\n",
+			   ci.value().toString().toUtf8().constData());
+
+    if(post_filenames[ci.key()]) {
+      ret+="<td align=\"center\">Yes</td>\n";
+    }
+    else {
+      ret+="<td align=\"center\">No</td>\n";
+    }
+    ret+="</tr>\n";
+  }
+
+  ret+="</table>\n";
+
+  return ret;
+}
+
+
 void RDFormPost::dump()
 {
   printf("Content-type: text/html\n\n");
@@ -576,7 +620,7 @@ void RDFormPost::LoadUrlEncoding(char first)
     total_read+=n;
   }
 
-  post_data[total_read]=0;
+  post_data[total_read+1]=0;
   lines=QString(post_data).split("&");
 
   for(int i=0;i<lines.size();i++) {
diff --git a/lib/rdformpost.h b/lib/rdformpost.h
index bef0f8a3..34f2c821 100644
--- a/lib/rdformpost.h
+++ b/lib/rdformpost.h
@@ -58,6 +58,8 @@ class RDFormPost
   QString tempDir() const;
   unsigned headerContentLength() const;
   QString headerContentType() const;
+  QByteArray rawPost() const;
+  QString parsedPost() const;
   void dump();
   void dumpRawPost();
   static QString errorString(RDFormPost::Error err);