Merge pull request #47 from dylanhitt/main

NSEcho · web-flow · commit adea1015e9c8 · 2024-10-03T17:56:49.000+02:00
fix: handle GError a bit early in some cases
diff --git a/frida/device.go b/frida/device.go
@@ -173,8 +173,10 @@ func (d *Device) params(opts options) (map[string]any, error) {
 
 	var err *C.GError
 	ht := C.frida_device_query_system_parameters_sync(d.device, opts.cancellable, &err)
-
-	return gHashTableToMap(ht), handleGError(err)
+	if err != nil {
+		return nil, handleGError(err)
+	}
+	return gHashTableToMap(ht), nil
 }
 
 // FrontmostApplication will return the frontmost application or the application in focus
diff --git a/frida/service.go b/frida/service.go
@@ -31,8 +31,10 @@ func (s *Service) Request(req any) (any, error) {
 
 	var err *C.GError
 	resp := C.frida_service_request_sync(s.service, variant, nil, &err)
-
-	return gVariantToGo(resp), handleGError(err)
+	if err != nil {
+		return nil, handleGError(err)
+	}
+	return gVariantToGo(resp), nil
 }
 
 func (s *Service) Activate() error {
diff --git a/frida/session.go b/frida/session.go
@@ -121,9 +121,12 @@ func (s *Session) CompileScript(script string, opts *ScriptOptions) ([]byte, err
 		scriptC,
 		opts.opts,
 		nil,
-		&err)
-
-	return getGBytes(bts), handleGError(err)
+		&err,
+	)
+	if err != nil {
+		return nil, handleGError(err)
+	}
+	return getGBytes(bts), nil
 }
 
 // SnapshotScript creates snapshot from the script.
@@ -137,9 +140,12 @@ func (s *Session) SnapshotScript(embedScript string, snapshotOpts *SnapshotOptio
 		embedScriptC,
 		snapshotOpts.opts,
 		nil,
-		&err)
-
-	return getGBytes(ret), handleGError(err)
+		&err,
+	)
+	if err != nil {
+		return nil, handleGError(err)
+	}
+	return getGBytes(ret), nil
 }
 
 // SetupPeerConnection sets up peer (p2p) connection with peer options provided.
