summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2011-04-17 13:43:00 -0400
committerGravatar Adam Chlipala <adam@chlipala.net>2011-04-17 13:43:00 -0400
commit71f049713bc52fab0c85b84265c6e3db783d69c3 (patch)
tree1ef3d07d85c0a8e80ae15c3cc4d8701a161f4fbe /src
parentc4b35bfac2f71541d5fddb948ca0d82039dc67fe (diff)
Before allowing an indirect return, check (dynamically, for now) that we aren't in an RPC handler
Diffstat (limited to 'src')
-rw-r--r--src/c/urweb.c16
-rw-r--r--src/cjr_print.sml2
2 files changed, 15 insertions, 3 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c
index f5ff7054..4dae4c3d 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -414,7 +414,7 @@ struct uw_context {
void *get_header_data;
uw_buffer outHeaders, page, heap, script;
- int returning_indirectly;
+ int allowed_to_return_indirectly, returning_indirectly;
input *inputs, *subinputs, *cur_container;
size_t sz_inputs, n_subinputs, used_subinputs;
@@ -477,7 +477,7 @@ uw_context uw_init(int id, void *logger_data, uw_logger log_debug) {
ctx->outHeaders.start[0] = 0;
uw_buffer_init(uw_page_max, &ctx->page, 1);
ctx->page.start[0] = 0;
- ctx->returning_indirectly = 0;
+ ctx->allowed_to_return_indirectly = ctx->returning_indirectly = 0;
uw_buffer_init(uw_heap_max, &ctx->heap, uw_min_heap);
uw_buffer_init(uw_script_max, &ctx->script, 1);
ctx->script.start[0] = 0;
@@ -591,7 +591,7 @@ void uw_reset_keep_error_message(uw_context ctx) {
uw_buffer_reset(&ctx->script);
ctx->script.start[0] = 0;
uw_buffer_reset(&ctx->page);
- ctx->returning_indirectly = 0;
+ ctx->allowed_to_return_indirectly = ctx->returning_indirectly = 0;
uw_buffer_reset(&ctx->heap);
ctx->regions = NULL;
ctx->cleanup_front = ctx->cleanup;
@@ -3418,6 +3418,9 @@ __attribute__((noreturn)) void uw_return_blob(uw_context ctx, uw_Basis_blob b, u
cleanup *cl;
int len;
+ if (!ctx->allowed_to_return_indirectly)
+ uw_error(ctx, FATAL, "Tried to return a blob from an RPC");
+
ctx->returning_indirectly = 1;
uw_buffer_reset(&ctx->outHeaders);
uw_buffer_reset(&ctx->page);
@@ -3445,6 +3448,9 @@ __attribute__((noreturn)) void uw_redirect(uw_context ctx, uw_Basis_string url)
cleanup *cl;
char *s;
+ if (!ctx->allowed_to_return_indirectly)
+ uw_error(ctx, FATAL, "Tried to redirect from an RPC");
+
ctx->returning_indirectly = 1;
uw_buffer_reset(&ctx->page);
ctx_uw_buffer_check(ctx, "page", &ctx->page, uw_buffer_used(&ctx->outHeaders)+1);
@@ -3792,3 +3798,7 @@ failure_kind uw_begin_onError(uw_context ctx, char *msg) {
} else
uw_error(ctx, FATAL, "Tried to run nonexistent onError handler");
}
+
+void uw_mayReturnIndirectly(uw_context ctx) {
+ ctx->allowed_to_return_indirectly = 1;
+}
diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index 3988a921..9e953737 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -2651,6 +2651,8 @@ fun p_file env (ds, ps) =
newline,
string "uw_write(ctx, begin_xhtml);",
newline,
+ string "uw_mayReturnIndirectly(ctx);",
+ newline,
string "uw_set_script_header(ctx, \"",
let
val scripts =