Skip to content

Commit ab04bdf

Browse files
TreeHunter9Artyom Ivanov
andauthored
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 7f3cf6a commit ab04bdf

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

21242124
case isc_arg_number:
2125-
default:
2125+
case isc_arg_unix:
2126+
case isc_arg_win32:
2127+
case isc_arg_gds:
2128+
case isc_arg_warning:
2129+
case isc_arg_next_mach:
21262130
if (xdrs->x_op == XDR_ENCODE)
21272131
vec = *vectorEncode++;
21282132
if (!xdr_long(xdrs, &vec))
21292133
goto brk;
21302134
if (xdrs->x_op == XDR_DECODE)
21312135
vectorDecode.push((ISC_STATUS) vec);
21322136
break;
2137+
2138+
default:
2139+
goto brk;
21332140
}
21342141
}
21352142

0 commit comments

Comments
 (0)