Skip to content

Commit 6e9ef84

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 d2b6082 commit 6e9ef84

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
@@ -2128,14 +2128,21 @@ static bool_t xdr_status_vector(RemoteXdr* xdrs, DynamicStatusVector*& vector)
21282128
break;
21292129

21302130
case isc_arg_number:
2131-
default:
2131+
case isc_arg_unix:
2132+
case isc_arg_win32:
2133+
case isc_arg_gds:
2134+
case isc_arg_warning:
2135+
case isc_arg_next_mach:
21322136
if (xdrs->x_op == XDR_ENCODE)
21332137
vec = *vectorEncode++;
21342138
if (!xdr_long(xdrs, &vec))
21352139
goto brk;
21362140
if (xdrs->x_op == XDR_DECODE)
21372141
vectorDecode.push((ISC_STATUS) vec);
21382142
break;
2143+
2144+
default:
2145+
goto brk;
21392146
}
21402147
}
21412148

0 commit comments

Comments
 (0)