diff options
author | Ray Strode <rstrode@redhat.com> | 2018-03-22 13:00:33 -0400 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2018-03-28 16:46:36 -0400 |
commit | f7241fd76eccd945ab1efe3df84fe1a53b8b2c98 (patch) | |
tree | 725ad638997257c952b3b28299b1107240761332 /src | |
parent | 8b2fd8cf09fe93b9f5d39469174bbb319cddc2ff (diff) | |
download | polkit-f7241fd76eccd945ab1efe3df84fe1a53b8b2c98.tar.gz |
jsauthority: Fix up JS_CallFunctionName invocations
The way args are passed in changed.
Diffstat (limited to 'src')
-rw-r--r-- | src/polkitbackend/polkitbackendjsauthority.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp index ad2c3eb..5974b45 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp @@ -93,8 +93,8 @@ struct _PolkitBackendJsAuthorityPrivate }; static bool execute_script_with_runaway_killer (PolkitBackendJsAuthority *authority, - JSScript *script, - JS::Value *rval); + JS::HandleScript script, + JS::MutableHandleValue rval); static void utils_spawn (const gchar *const *argv, guint timeout_seconds, @@ -343,16 +343,18 @@ load_scripts (PolkitBackendJsAuthority *authority) static void reload_scripts (PolkitBackendJsAuthority *authority) { - JS::Value argv[1] = {JS::NullValue()}; - JS::Value rval = JS::NullValue(); - JS_BeginRequest (authority->priv->cx); + JS::AutoValueArray<1> args(authority->priv->cx); + JS::RootedValue rval(authority->priv->cx); + + JS::RootedObject js_polkit(authority->priv->cx, authority->priv->js_polkit->get ()); + + args[0].setUndefined (); if (!JS_CallFunctionName(authority->priv->cx, - authority->priv->js_polkit, + js_polkit, "_deleteRules", - 0, - argv, + args, &rval)) { polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), @@ -1031,8 +1033,8 @@ runaway_killer_teardown (PolkitBackendJsAuthority *authority) static bool execute_script_with_runaway_killer (PolkitBackendJsAuthority *authority, - JSScript *script, - JS::Value *rval) + JS::HandleScript script, + JS::MutableHandleValue rval) { bool ret; @@ -1049,17 +1051,17 @@ execute_script_with_runaway_killer (PolkitBackendJsAuthority *authority, static bool call_js_function_with_runaway_killer (PolkitBackendJsAuthority *authority, const char *function_name, - unsigned argc, - JS::Value *argv, - JS::Value *rval) + const JS::HandleValueArray &args, + JS::RootedValue *rval) { bool ret; + JS::RootedObject js_polkit(authority->priv->cx, authority->priv->js_polkit->get ()); + runaway_killer_setup (authority); ret = JS_CallFunctionName(authority->priv->cx, - authority->priv->js_polkit, + js_polkit, function_name, - argc, - argv, + args, rval); runaway_killer_teardown (authority); return ret; @@ -1079,8 +1081,8 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA { PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority); GList *ret = NULL; - JS::Value argv[2] = {JS::NullValue(), JS::NullValue()}; - JS::Value rval = JS::NullValue(); + JS::AutoValueArray<2> args(authority->priv->cx); + JS::RootedValue rval(authority->priv->cx); guint n; GError *error = NULL; JSString *ret_jsstr; @@ -1089,7 +1091,7 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA JS_BeginRequest (authority->priv->cx); - if (!action_and_details_to_jsval (authority, action_id, details, &argv[0], &error)) + if (!action_and_details_to_jsval (authority, action_id, details, args[0], &error)) { polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), "Error converting action and details to JS object: %s", @@ -1103,7 +1105,7 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA user_for_subject, subject_is_local, subject_is_active, - &argv[1], + args[1], &error)) { polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), @@ -1115,8 +1117,7 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA if (!call_js_function_with_runaway_killer (authority, "_runAdminRules", - G_N_ELEMENTS (argv), - argv, + args, &rval)) { polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), @@ -1188,8 +1189,8 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu { PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority); PolkitImplicitAuthorization ret = implicit; - JS::Value argv[2] = {JS::NullValue(), JS::NullValue()}; - JS::Value rval = JS::NullValue(); + JS::AutoValueArray<2> args(authority->priv->cx); + JS::RootedValue rval(authority->priv->cx); GError *error = NULL; JSString *ret_jsstr; const jschar *ret_utf16; @@ -1198,7 +1199,7 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu JS_BeginRequest (authority->priv->cx); - if (!action_and_details_to_jsval (authority, action_id, details, &argv[0], &error)) + if (!action_and_details_to_jsval (authority, action_id, details, args[0], &error)) { polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), "Error converting action and details to JS object: %s", @@ -1212,7 +1213,7 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu user_for_subject, subject_is_local, subject_is_active, - &argv[1], + args[1], &error)) { polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), @@ -1224,8 +1225,7 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu if (!call_js_function_with_runaway_killer (authority, "_runRules", - G_N_ELEMENTS (argv), - argv, + args, &rval)) { polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), |