Skip to content

Commit fec84c2

Browse files
TreeHunter9Artyom Ivanov
authored andcommitted
Merge commit from fork
* fix(protocol): Handle cstring in status_vector parsing * Revert "fix(protocol): Handle cstring in status_vector parsing" This reverts commit 703bdc2560726069074d5873c414f993169e2623. * fix(protocol): Fallback on encountering unknown isc_arg when parsing status_vector --------- Co-authored-by: Artyom Ivanov <artyom.ivanov@red-soft.ru>
1 parent cd5e447 commit fec84c2

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

src/remote/protocol.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,14 +2074,21 @@ static bool_t xdr_status_vector(RemoteXdr* xdrs, DynamicStatusVector*& vector)
20742074
break;
20752075

20762076
case isc_arg_number:
2077-
default:
2077+
case isc_arg_unix:
2078+
case isc_arg_win32:
2079+
case isc_arg_gds:
2080+
case isc_arg_warning:
2081+
case isc_arg_next_mach:
20782082
if (xdrs->x_op == XDR_ENCODE)
20792083
vec = *vectorEncode++;
20802084
if (!xdr_long(xdrs, &vec))
20812085
goto brk;
20822086
if (xdrs->x_op == XDR_DECODE)
20832087
vectorDecode.push((ISC_STATUS) vec);
20842088
break;
2089+
2090+
default:
2091+
goto brk;
20852092
}
20862093
}
20872094

0 commit comments

Comments
 (0)