bugfix #709: don't g_assert returned (mandatory) length of some NDIS driver functions.
simply ignore the length returned in that cases this way, we may "print" buggy data, but that's what the driver returned ... svn path=/trunk/; revision=17066
This commit is contained in:
parent
a052b3a98b
commit
89a40818e2
|
@ -938,7 +938,6 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA
|
||||||
|
|
||||||
length = sizeof(ushort_value);
|
length = sizeof(ushort_value);
|
||||||
if (wpcap_packet_request(adapter, OID_GEN_DRIVER_VERSION, FALSE /* !set */, (char *) &ushort_value, &length)) {
|
if (wpcap_packet_request(adapter, OID_GEN_DRIVER_VERSION, FALSE /* !set */, (char *) &ushort_value, &length)) {
|
||||||
g_assert(length == 2);
|
|
||||||
g_snprintf(string_buff, DETAILS_STR_MAX, "%u.%u", ushort_value / 0x100, ushort_value % 0x100);
|
g_snprintf(string_buff, DETAILS_STR_MAX, "%u.%u", ushort_value / 0x100, ushort_value % 0x100);
|
||||||
} else {
|
} else {
|
||||||
g_snprintf(string_buff, DETAILS_STR_MAX, "-");
|
g_snprintf(string_buff, DETAILS_STR_MAX, "-");
|
||||||
|
@ -947,7 +946,6 @@ capture_if_details_general(GtkWidget *table, GtkWidget *main_vb, guint *row, LPA
|
||||||
|
|
||||||
length = sizeof(uint_value);
|
length = sizeof(uint_value);
|
||||||
if (wpcap_packet_request(adapter, OID_GEN_VENDOR_DRIVER_VERSION, FALSE /* !set */, (char *) &uint_value, &length)) {
|
if (wpcap_packet_request(adapter, OID_GEN_VENDOR_DRIVER_VERSION, FALSE /* !set */, (char *) &uint_value, &length)) {
|
||||||
g_assert(length == 4);
|
|
||||||
/* XXX - what's the correct output format? */
|
/* XXX - what's the correct output format? */
|
||||||
g_snprintf(string_buff, DETAILS_STR_MAX, "%u.%u (Hex: %X.%X)",
|
g_snprintf(string_buff, DETAILS_STR_MAX, "%u.%u (Hex: %X.%X)",
|
||||||
(uint_value / 0x10000 ) % 0x10000,
|
(uint_value / 0x10000 ) % 0x10000,
|
||||||
|
|
Loading…
Reference in New Issue