Skip to content

Commit ae05e8e

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 83c364c commit ae05e8e

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
@@ -1736,14 +1736,21 @@ static bool_t xdr_status_vector(XDR* xdrs, DynamicStatusVector*& vector)
17361736
break;
17371737

17381738
case isc_arg_number:
1739-
default:
1739+
case isc_arg_unix:
1740+
case isc_arg_win32:
1741+
case isc_arg_gds:
1742+
case isc_arg_warning:
1743+
case isc_arg_next_mach:
17401744
if (xdrs->x_op == XDR_ENCODE)
17411745
vec = *vectorEncode++;
17421746
if (!xdr_long(xdrs, &vec))
17431747
goto brk;
17441748
if (xdrs->x_op == XDR_DECODE)
17451749
vectorDecode.push((ISC_STATUS) vec);
17461750
break;
1751+
1752+
default:
1753+
goto brk;
17471754
}
17481755
}
17491756

0 commit comments

Comments
 (0)