Report an error if DWC sends a command string that is too long

Duet3D · Nov 30, 2022 · 8ba4605 · 8ba4605
1 parent 46bb072
commit 8ba4605
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/GCodes/GCodeInput.cpp b/src/GCodes/GCodeInput.cpp
@@ -217,7 +217,7 @@ void NetworkGCodeInput::Put(MessageType mtype, char c) noexcept
 	}
 }
 
-void NetworkGCodeInput::Put(MessageType mtype, const char *buf) noexcept
+bool NetworkGCodeInput::Put(MessageType mtype, const char *buf) noexcept
 {
 	const size_t len = strlen(buf) + 1;
 	MutexLocker lock(bufMutex, 200);
@@ -230,8 +230,10 @@ void NetworkGCodeInput::Put(MessageType mtype, const char *buf) noexcept
 			{
 				Put(mtype, buf[i]);
 			}
+			return true;
 		}
 	}
+	return false;
 }
 
 NetworkGCodeInput::NetworkGCodeInput() noexcept : RegularGCodeInput()

diff --git a/src/GCodes/GCodeInput.h b/src/GCodes/GCodeInput.h
@@ -129,7 +129,7 @@ class NetworkGCodeInput : public RegularGCodeInput
 	NetworkGCodeInput() noexcept;
 
 	bool FillBuffer(GCodeBuffer *gb) noexcept override;			// Fill a GCodeBuffer with the last available G-code
-	void Put(MessageType mtype, const char *buf) noexcept;		// Append a null-terminated string to the buffer
+	bool Put(MessageType mtype, const char *buf) noexcept;		// Append a null-terminated string to the buffer returning true if success
 
 private:
 	void Put(MessageType mtype, char c) noexcept;				// Append a single character. This does NOT lock the mutex!

diff --git a/src/Networking/HttpResponder.cpp b/src/Networking/HttpResponder.cpp
@@ -529,11 +529,14 @@ bool HttpResponder::GetJsonResponse(const char *_ecv_array request, OutputBuffer
 		const char *command = GetKeyValue("gcode");
 		NetworkGCodeInput * const httpInput = reprap.GetGCodes().GetHTTPInput();
 		// If the command is empty, just report the buffer space. This allows rr_gcode to be used to poll the buffer space without using it up.
-		if (command != nullptr && command[0] != 0)
+		if (command != nullptr && command[0] != 0 && !httpInput->Put(HttpMessage, command))
 		{
-			httpInput->Put(HttpMessage, command);
+			response->copy("{\"err\":1}");								// the command string wasn't accepted, it's probably too long
+		}
+		else
+		{
+			response->printf("{\"buff\":%u}", httpInput->BufferSpaceLeft());
 		}
-		response->printf("{\"buff\":%u}", httpInput->BufferSpaceLeft());
 	}
 #if HAS_MASS_STORAGE
 	else if (StringEqualsIgnoreCase(request, "upload"))