Fix AdbSocket.ReadString #131

Author: wherewhere

AdvancedSharpAdbClient.Tests/AdbSocketTests.Async.cs

@@ -84,6 +84,28 @@ public async Task ReadStringAsyncTest()
             Assert.Equal("Hello", await socket.ReadStringAsync());
         }
 
+        /// <summary>
+        /// Tests the <see cref="AdbSocket.ReadStringAsync(CancellationToken)"/> method.
+        /// </summary>
+        [Fact]
+        public async Task ReadFailStringAsyncTest()
+        {
+            using DummyTcpSocket tcpSocket = new();
+            using AdbSocket socket = new(tcpSocket);
+
+            await using (BinaryWriter writer = new(tcpSocket.InputStream, Encoding.UTF8, true))
+            {
+                writer.Write(Encoding.UTF8.GetBytes(nameof(SyncCommand.FAIL)));
+                writer.Write(Encoding.UTF8.GetBytes(5.ToString("X4")));
+                writer.Write("Hello"u8);
+                writer.Flush();
+            }
+
+            tcpSocket.InputStream.Position = 0;
+
+            Assert.Equal("Hello", await socket.ReadStringAsync());
+        }
+
         /// <summary>
         /// Tests the <see cref="AdbSocket.ReadSyncStringAsync(CancellationToken)"/> method.
         /// </summary>

AdvancedSharpAdbClient.Tests/AdbSocketTests.cs

@@ -129,6 +129,28 @@ public void ReadStringTest()
             Assert.Equal("Hello", socket.ReadString());
         }
 
+        /// <summary>
+        /// Tests the <see cref="AdbSocket.ReadString"/> method.
+        /// </summary>
+        [Fact]
+        public void ReadFailStringTest()
+        {
+            using DummyTcpSocket tcpSocket = new();
+            using AdbSocket socket = new(tcpSocket);
+
+            using (BinaryWriter writer = new(tcpSocket.InputStream, Encoding.UTF8, true))
+            {
+                writer.Write(Encoding.UTF8.GetBytes(nameof(SyncCommand.FAIL)));
+                writer.Write(Encoding.UTF8.GetBytes(5.ToString("X4")));
+                writer.Write("Hello"u8);
+                writer.Flush();
+            }
+
+            tcpSocket.InputStream.Position = 0;
+
+            Assert.Equal("Hello", socket.ReadString());
+        }
+
         /// <summary>
         /// Tests the <see cref="AdbSocket.ReadSyncString"/> method.
         /// </summary>

AdvancedSharpAdbClient/AdbSocket.Async.cs

@@ -179,6 +179,7 @@ public virtual async Task<int> ReadAsync(byte[] data, int offset, int length, Ca
         /// <inheritdoc/>
         public virtual async Task<string> ReadStringAsync(CancellationToken cancellationToken = default)
         {
+        start:
             // The first 4 bytes contain the length of the string
             byte[] reply = new byte[4];
             int read = await ReadAsync(reply, cancellationToken).ConfigureAwait(false);
@@ -191,14 +192,19 @@ public virtual async Task<string> ReadStringAsync(CancellationToken cancellation
 
             // Convert the bytes to a hex string
             string lenHex = AdbClient.Encoding.GetString(reply);
-            int len = int.Parse(lenHex, NumberStyles.HexNumber);
-
-            // And get the string
-            reply = new byte[len];
-            _ = await ReadAsync(reply, cancellationToken).ConfigureAwait(false);
+            if (int.TryParse(lenHex, NumberStyles.HexNumber, null, out int len))
+            {
+                // And get the string
+                reply = new byte[len];
+                _ = await ReadAsync(reply, cancellationToken).ConfigureAwait(false);
 
-            string value = AdbClient.Encoding.GetString(reply);
-            return value;
+                string value = AdbClient.Encoding.GetString(reply);
+                return value;
+            }
+            else
+            {
+                goto start;
+            }
         }
 
         /// <inheritdoc/>

AdvancedSharpAdbClient/AdbSocket.cs

@@ -263,6 +263,7 @@ public virtual int Read(byte[] data, int offset, int length)
         /// <inheritdoc/>
         public virtual string ReadString()
         {
+        start:
             // The first 4 bytes contain the length of the string
             byte[] reply = new byte[4];
             int read = Read(reply);
@@ -275,14 +276,19 @@ public virtual string ReadString()
 
             // Convert the bytes to a hex string
             string lenHex = AdbClient.Encoding.GetString(reply);
-            int len = int.Parse(lenHex, NumberStyles.HexNumber);
-
-            // And get the string
-            reply = new byte[len];
-            _ = Read(reply);
+            if (int.TryParse(lenHex, NumberStyles.HexNumber, null, out int len))
+            {
+                // And get the string
+                reply = new byte[len];
+                _ = Read(reply);
 
-            string value = AdbClient.Encoding.GetString(reply);
-            return value;
+                string value = AdbClient.Encoding.GetString(reply);
+                return value;
+            }
+            else
+            {
+                goto start;
+            }
         }
 
         /// <inheritdoc/>

Directory.Build.props

@@ -23,7 +23,7 @@
     <RepositoryUrl>https://github.com/SharpAdb/AdvancedSharpAdbClient</RepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <Title>.NET client for adb, Android Debug Bridge (AdvancedSharpAdbClient)</Title>
-    <VersionPrefix>3.5.15</VersionPrefix>
+    <VersionPrefix>3.5.16</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup>