github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 21:10:54 +08:00
Code Projects Activity

[v2, darwin] Make sure to copy the uri during processURLRequest (#1668)

Browse Source 
There's no guarantee that the pointer is still valid when
processURLRequest is finished. So we might end up with an
invalid pointer when the request is asynchronously processed.
This commit is contained in:
stffabi 2022-07-28 08:56:11 +02:00 committed by GitHub
parent 17b17558e6
commit 53e875d96f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
v2/internal/frontend/desktop/darwin/frontend.go
View File

@ -309,11 +309,9 @@ func (f *Frontend) ExecJS(js string) {
}
func (f *Frontend) processRequest(r *request) {
uri := C.GoString(r.url)
rw := httptest.NewRecorder()
f.assets.ProcessHTTPRequest(
uri,
r.url,
rw,
func() (*http.Request, error) {
req, err := r.GetHttpRequest()
@ -352,7 +350,9 @@ func (f *Frontend) processRequest(r *request) {
headersLen = len(headerData)
}
C.ProcessURLResponse(r.ctx, r.url, C.int(rw.Code), headers, C.int(headersLen), content, C.int(contentLen))
url := C.CString(r.url)
defer C.free(unsafe.Pointer(url))
C.ProcessURLResponse(r.ctx, url, C.int(rw.Code), headers, C.int(headersLen), content, C.int(contentLen))
}
//func (f *Frontend) processSystemEvent(message string) {
@ -372,7 +372,7 @@ func (f *Frontend) processRequest(r *request) {
//}
type request struct {
url *C.char
url string
method string
headers string
body []byte
@ -386,7 +386,7 @@ func (r *request) GetHttpRequest() (*http.Request, error) {
body = bytes.NewReader(r.body)
}
req, err := http.NewRequest(r.method, C.GoString(r.url), body)
req, err := http.NewRequest(r.method, r.url, body)
if err != nil {
return nil, err
}
@ -419,7 +419,7 @@ func processURLRequest(ctx unsafe.Pointer, url *C.char, method *C.char, headers
}
requestBuffer <- &request{
url: url,
url: C.GoString(url),
method: C.GoString(method),
headers: C.GoString(headers),
body: goBody,