Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-20 Thread Guy Harris 
On Jul 20, 2024, at 2:40 PM, John Thacker  wrote:

> Well, a previous version of the commit did change packet-pkcs12.c - and then 
> Anders changed it as a result of Gerald answering his question, so it no 
> longer had that.
> 
> https://gitlab.com/wireshark/wireshark/-/merge_requests/16485/diffs?diff_id=1069953531&start_sha=bd24c888d3cc359e3d7cbf94891a120a0f8a3d7d

And that older version may have somehow polluted a checked-out repository or 
something and subsequent builds didn't get rid of the 
no-longer-part-of-the-merge-request epan/dissectors/packet-pkcs12.c left in 
that repository.
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-20 Thread John Thacker 
On Sat, Jul 20, 2024, 2:29 PM Guy Harris  wrote:

> On Jul 20, 2024, at 3:09 AM, John Thacker  wrote:
>
> > On Fri, Jul 19, 2024, 10:53 PM Guy Harris  wrote:
> >
> >> On Jul 19, 2024, at 5:39 PM, John Thacker 
> wrote:
> >>
> >>> On Fri, Jul 19, 2024 at 8:07 PM Guy Harris  wrote:
> >>>
> >>> Not sure what it's diffing there, given that both
> epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c and
> epan/dissectors/packet-pkcs12.c appear to be passing TRUE to
> g_string_free() in the one and only call to g_string_free().
> >>
> >> It's diffing that the MR in question is changing that TRUE to true, but
> not changing the template in the asn1 directory.
> >
> > Which MR is that?
> >
> > https://gitlab.com/wireshark/wireshark/-/merge_requests/16485
>
> And that's change 75ea337b681d6a21f5d9b896005057cd4139a919, which doesn't
> modify the PKCS12 dissector; it was done after the generated ASN.1 were
> changed, so it didn't have to - and changed no packet-XXX-template.c files
> for ASN.1 dissectors.
>
> It *did* change one TRUE to true in a g_string_free() call, but that was
> in epan/dissectors/packet-protobuf.c.
>

Well, a previous version of the commit did change packet-pkcs12.c - and
then Anders changed it as a result of Gerald answering his question, so it
no longer had that.

https://gitlab.com/wireshark/wireshark/-/merge_requests/16485/diffs?diff_id=1069953531&start_sha=bd24c888d3cc359e3d7cbf94891a120a0f8a3d7d

John

>
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-20 Thread Guy Harris 
On Jul 20, 2024, at 3:09 AM, John Thacker  wrote:

> On Fri, Jul 19, 2024, 10:53 PM Guy Harris  wrote:
> 
>> On Jul 19, 2024, at 5:39 PM, John Thacker  wrote:
>> 
>>> On Fri, Jul 19, 2024 at 8:07 PM Guy Harris  wrote:
>>> 
>>> Not sure what it's diffing there, given that both 
>>> epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c and 
>>> epan/dissectors/packet-pkcs12.c appear to be passing TRUE to 
>>> g_string_free() in the one and only call to g_string_free().
>> 
>> It's diffing that the MR in question is changing that TRUE to true, but not 
>> changing the template in the asn1 directory.
> 
> Which MR is that?
> 
> https://gitlab.com/wireshark/wireshark/-/merge_requests/16485

And that's change 75ea337b681d6a21f5d9b896005057cd4139a919, which doesn't 
modify the PKCS12 dissector; it was done after the generated ASN.1 were 
changed, so it didn't have to - and changed no packet-XXX-template.c files for 
ASN.1 dissectors.

It *did* change one TRUE to true in a g_string_free() call, but that was in 
epan/dissectors/packet-protobuf.c.
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-20 Thread John Thacker 
On Fri, Jul 19, 2024, 10:53 PM Guy Harris  wrote:

> On Jul 19, 2024, at 5:39 PM, John Thacker  wrote:
>
> > On Fri, Jul 19, 2024 at 8:07 PM Guy Harris  wrote:
> >
> >> Not sure what it's diffing there, given that both
> epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c and
> epan/dissectors/packet-pkcs12.c appear to be passing TRUE to
> g_string_free() in the one and only call to g_string_free().
> >
> > It's diffing that the MR in question is changing that TRUE to true, but
> not changing the template in the asn1 directory.
>
> Which MR is that?


https://gitlab.com/wireshark/wireshark/-/merge_requests/16485

The pipeline that Anders shared that was failing was for the MR above. The
cppcheck script sometimes seems to print some spurious errors when files
are changed that contain macros because it only checks the changed files in
a MR, or something like that. At least that doesn't cause a failure.


>
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-19 Thread Guy Harris 
On Jul 19, 2024, at 5:39 PM, John Thacker  wrote:

> On Fri, Jul 19, 2024 at 8:07 PM Guy Harris  wrote:
> 
>> Not sure what it's diffing there, given that both 
>> epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c and 
>> epan/dissectors/packet-pkcs12.c appear to be passing TRUE to g_string_free() 
>> in the one and only call to g_string_free().
> 
> It's diffing that the MR in question is changing that TRUE to true, but not 
> changing the template in the asn1 directory.

Which MR is that?  It *shouldn't* be changed to true, as the formal argument is 
a gboolean, not a bool, and, at least in the tip of the master branch, it 
*isn't* changed to true.  That's not generated code, so it shouldn't be 
affected by any change to asn2wrs.

And I'm not seeing any commits to epan/dissectors/packet-pkcs12.c on the main 
branch in which true, rather than TRUE, was passed to g_string_free().
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-19 Thread John Thacker 
On Fri, Jul 19, 2024 at 8:07 PM Guy Harris  wrote:

> On Jul 19, 2024, at 2:19 PM, Gerald Combs  wrote:
>
> > The cppcheck warning needs to be fixed, but it looks like the job is
> failing due to a change in packet-pkcs12.c:
> >
> > 
> > diff --git a/epan/dissectors/packet-pkcs12.c
> b/epan/dissectors/packet-pkcs12.c
> > index 3412292d..65796bf9 100644
> > --- a/epan/dissectors/packet-pkcs12.c
> > +++ b/epan/dissectors/packet-pkcs12.c
> > @@ -423,7 +423,7 @@ int PBE_decrypt_data(const char
> *object_identifier_id_param _U_, tvbuff_t *encry
> > /* add it as a new source */
> > add_new_data_source(actx->pinfo, clear_tvb, name->str);
> > - g_string_free(name, true);
> > + g_string_free(name, TRUE);
> >   /* now try and decode it */
> > call_ber_oid_callback(object_identifier_id_param, clear_tvb, 0,
> actx->pinfo, tree, NULL);
> > 
>
> Not sure what it's diffing there, given that both
> epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c and
> epan/dissectors/packet-pkcs12.c appear to be passing TRUE to
> g_string_free() in the one and only call to g_string_free().
>

It's diffing that the MR in question is changing that TRUE to true, but not
changing the template in the asn1 directory.

John
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-19 Thread Guy Harris 
On Jul 19, 2024, at 2:19 PM, Gerald Combs  wrote:

> The cppcheck warning needs to be fixed, but it looks like the job is failing 
> due to a change in packet-pkcs12.c:
> 
> 
> diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
> index 3412292d..65796bf9 100644
> --- a/epan/dissectors/packet-pkcs12.c
> +++ b/epan/dissectors/packet-pkcs12.c
> @@ -423,7 +423,7 @@ int PBE_decrypt_data(const char 
> *object_identifier_id_param _U_, tvbuff_t *encry
> /* add it as a new source */
> add_new_data_source(actx->pinfo, clear_tvb, name->str);
> - g_string_free(name, true);
> + g_string_free(name, TRUE);
>   /* now try and decode it */
> call_ber_oid_callback(object_identifier_id_param, clear_tvb, 0, actx->pinfo, 
> tree, NULL);
> 

Not sure what it's diffing there, given that both 
epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c and 
epan/dissectors/packet-pkcs12.c appear to be passing TRUE to g_string_free() in 
the one and only call to g_string_free().
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-19 Thread Guy Harris 
On Jul 19, 2024, at 2:06 PM, Anders Broman  wrote:

> Not sure why this pipeline fails. Can someone help?
> 
> https://gitlab.com/wireshark/wireshark/-/jobs/7386780020 
> ./tools/cppcheck/cppcheck.sh -l $NUM_COMMITS | tee 
> cppcheck/cppcheck_report.txt [0;m
> epan/tvbuff.h:1083:1: warning: There is an unknown macro here somewhere. 
> Configuration is required. If WS_DEPRECATED_X is a macro then please 
> configure it. [unknownMacro]

Given that the compile succeeds, presumably include/ws_attributes.h always gets 
indirectly included before epan/tvbuff.h, so I'm not sure what cppcheck's 
problem is, but I've changed epan/tvbuff.h explicitly include it (and 
ws_symbol_export.h) in !16504.
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] Failed piplines unrelated WS_DEPRECATED_X ?

2024-07-19 Thread Gerald Combs 

The cppcheck warning needs to be fixed, but it looks like the job is failing 
due to a change in packet-pkcs12.c:


diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index 3412292d..65796bf9 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -423,7 +423,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param 
_U_, tvbuff_t *encry
/* add it as a new source */
add_new_data_source(actx->pinfo, clear_tvb, name->str);
 
-	g_string_free(name, true);

+   g_string_free(name, TRUE);
 
 	/* now try and decode it */

call_ber_oid_callback(object_identifier_id_param, clear_tvb, 0, 
actx->pinfo, tree, NULL);


(You have to expand the "Regenerating ASN.1 dissectors" section)

On 7/19/24 2:06 PM, Anders Broman wrote:

Hi,
Not sure why this pipeline fails. Can someone help?

https://gitlab.com/wireshark/wireshark/-/jobs/7386780020 


./tools/cppcheck/cppcheck.sh -l $NUM_COMMITS | tee cppcheck/cppcheck_report.txt 
[0;m

epan/tvbuff.h:1083:1: warning: There is an unknown macro here somewhere. 
Configuration is required. If WS_DEPRECATED_X is a macro then please configure 
it. [unknownMacro]


Best regards

Anders


___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
  mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe


___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe