Merge pull request #414 from antrv/feature/fix-getprocessid

honfika · web-flow · commit f2dbf772e4a3 · 2018-04-17T10:15:00.000+02:00
Fix releasing memory in GetProcessIdByLocalPort
diff --git a/Titanium.Web.Proxy/Helpers/Tcp.cs b/Titanium.Web.Proxy/Helpers/Tcp.cs
@@ -37,11 +37,10 @@ internal static unsafe int GetProcessIdByLocalPort(IpVersion ipVersion, int loca
                             0) == 0)
                     {
                         int rowCount = *(int*)tcpTable;
-                        tcpTable += 4; // int size
 
                         if (ipVersion == IpVersion.Ipv4)
                         {
-                            NativeMethods.TcpRow* rowPtr = (NativeMethods.TcpRow*)tcpTable;
+                            NativeMethods.TcpRow* rowPtr = (NativeMethods.TcpRow*)(tcpTable + 4);
 
                             for (int i = 0; i < rowCount; ++i)
                             {
@@ -55,7 +54,7 @@ internal static unsafe int GetProcessIdByLocalPort(IpVersion ipVersion, int loca
                         }
                         else
                         {
-                            NativeMethods.Tcp6Row* rowPtr = (NativeMethods.Tcp6Row*)tcpTable;
+                            NativeMethods.Tcp6Row* rowPtr = (NativeMethods.Tcp6Row*)(tcpTable + 4);
 
                             for (int i = 0; i < rowCount; ++i)
                             {

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,10 @@ internal static unsafe int GetProcessIdByLocalPort(IpVersion ipVersion, int loca`
`37`	`37`	`0) == 0)`
`38`	`38`	`{`
`39`	`39`	`int rowCount = (int)tcpTable;`
`40`		`- tcpTable += 4; // int size`
`41`	`40`
`42`	`41`	`if (ipVersion == IpVersion.Ipv4)`
`43`	`42`	`{`
`44`		`- NativeMethods.TcpRow* rowPtr = (NativeMethods.TcpRow*)tcpTable;`
	`43`	`+ NativeMethods.TcpRow* rowPtr = (NativeMethods.TcpRow*)(tcpTable + 4);`
`45`	`44`
`46`	`45`	`for (int i = 0; i < rowCount; ++i)`
`47`	`46`	`{`
`@@ -55,7 +54,7 @@ internal static unsafe int GetProcessIdByLocalPort(IpVersion ipVersion, int loca`
`55`	`54`	`}`
`56`	`55`	`else`
`57`	`56`	`{`
`58`		`- NativeMethods.Tcp6Row* rowPtr = (NativeMethods.Tcp6Row*)tcpTable;`
	`57`	`+ NativeMethods.Tcp6Row* rowPtr = (NativeMethods.Tcp6Row*)(tcpTable + 4);`
`59`	`58`
`60`	`59`	`for (int i = 0; i < rowCount; ++i)`
`61`	`60`	`{`