Skip to content

C
capnproto
Commit ca8c1386 authored by Matthew Maurer's avatar Matthew Maurer
Browse files
Options

Hard abort canonicalization w/o exceptions for cap

parent 6ef098a8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
c++/src/capnp/layout.c++
View file @ ca8c1386
...@@ -1861,12 +1861,12 @@ struct WireHelpers { ...@@ -1861,12 +1861,12 @@ struct WireHelpers {
goto useDefault; goto useDefault;
} }
#if !CAPNP_LITE
if (canonical) { if (canonical) {
KJ_FAIL_REQUIRE("Cannot create a canonical message with a capability") { KJ_FAIL_REQUIRE("Cannot create a canonical message with a capability") {
goto useDefault; break;
} }
} }
#if !CAPNP_LITE
KJ_IF_MAYBE(cap, srcCapTable->extractCap(src->capRef.index.get())) { KJ_IF_MAYBE(cap, srcCapTable->extractCap(src->capRef.index.get())) {
setCapabilityPointer(dstSegment, dstCapTable, dst, kj::mv(*cap)); setCapabilityPointer(dstSegment, dstCapTable, dst, kj::mv(*cap));
// Return dummy non-null pointer so OrphanBuilder doesn't end up null. // Return dummy non-null pointer so OrphanBuilder doesn't end up null.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment