Skip to content

Commit 92581be

Browse files
committed
Merge pull request #109 from VBA-tools/frees-memory
Resolve memory free bug in AutoProxy
2 parents fe5e012 + a83cada commit 92581be

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/WebHelpers.bas

+13-6
Original file line numberDiff line numberDiff line change
@@ -2628,7 +2628,7 @@ End Function
26282628
#End If
26292629

26302630
''
2631-
' AutoProxy 1.0.0
2631+
' AutoProxy 1.0.1
26322632
' (c) Damien Thirion
26332633
'
26342634
' Auto configure proxy server
@@ -2781,21 +2781,28 @@ AutoProxy_TryIEFallback:
27812781
End If
27822782

27832783
AutoProxy_Cleanup:
2784+
On Error GoTo 0
2785+
27842786
' Free any strings received from WinHttp APIs
27852787
If (AutoProxy_IEProxyConfig.AutoProxy_lpszAutoConfigUrl <> 0) Then
2786-
AutoProxy_GlobalFree (AutoProxy_IEProxyConfig.AutoProxy_lpszAutoConfigUrl)
2788+
AutoProxy_GlobalFree AutoProxy_IEProxyConfig.AutoProxy_lpszAutoConfigUrl
2789+
AutoProxy_IEProxyConfig.AutoProxy_lpszAutoConfigUrl = 0
27872790
End If
27882791
If (AutoProxy_IEProxyConfig.AutoProxy_lpszProxy <> 0) Then
2789-
AutoProxy_GlobalFree (AutoProxy_IEProxyConfig.AutoProxy_lpszProxy)
2792+
AutoProxy_GlobalFree AutoProxy_IEProxyConfig.AutoProxy_lpszProxy
2793+
AutoProxy_IEProxyConfig.AutoProxy_lpszProxy = 0
27902794
End If
27912795
If (AutoProxy_IEProxyConfig.AutoProxy_lpszProxyBypass <> 0) Then
2792-
AutoProxy_GlobalFree (AutoProxy_IEProxyConfig.AutoProxy_lpszProxyBypass)
2796+
AutoProxy_GlobalFree AutoProxy_IEProxyConfig.AutoProxy_lpszProxyBypass
2797+
AutoProxy_IEProxyConfig.AutoProxy_lpszProxyBypass = 0
27932798
End If
27942799
If (AutoProxy_ProxyInfo.AutoProxy_lpszProxy <> 0) Then
2795-
AutoProxy_GlobalFree (AutoProxy_ProxyInfo.AutoProxy_lpszProxy)
2800+
AutoProxy_GlobalFree AutoProxy_ProxyInfo.AutoProxy_lpszProxy
2801+
AutoProxy_ProxyInfo.AutoProxy_lpszProxy = 0
27962802
End If
27972803
If (AutoProxy_ProxyInfo.AutoProxy_lpszProxyBypass <> 0) Then
2798-
AutoProxy_GlobalFree (AutoProxy_ProxyInfo.AutoProxy_lpszProxyBypass)
2804+
AutoProxy_GlobalFree AutoProxy_ProxyInfo.AutoProxy_lpszProxyBypass
2805+
AutoProxy_ProxyInfo.AutoProxy_lpszProxyBypass = 0
27992806
End If
28002807

28012808
' Error handling

0 commit comments

Comments
 (0)