libucl: Fix bugs in C-style comment parser
ClosedPublic
Actions

Authored by des on Tue, Sep 30, 8:52 PM.

Details

Reviewers

bapt
bofh
kevans

Commits

rG4704cb6d92c0: libucl: Fix bugs in C-style comment parser
rGff997dde8c93: libucl: Fix bugs in C-style comment parser
rG073895078ef1: libucl: Fix bugs in C-style comment parser
rGb5e2bd5ef381: libucl: Fix bugs in C-style comment parser

Summary

When an asterisk is encountered inside a C-style comment, we first check
if there is at least one more character left in the buffer, and if that
character is a slash, which would terminate the comment. If that is not
the case, the next two characters are consumed without being inspected.
If one of those is a double quote, or the initial asterisk of an
asterisk-slash pair, we end up misparsing the comment.

MFC after: 3 days

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

des created this revision.Tue, Sep 30, 8:52 PM

Herald added a subscriber: imp. · View Herald TranscriptTue, Sep 30, 8:52 PM

des requested review of this revision.Tue, Sep 30, 8:52 PM

Harbormaster completed remote builds in B67425: Diff 163146.Tue, Sep 30, 8:52 PM

This has also been submitted upstream as #339

kevans accepted this revision.Tue, Sep 30, 11:37 PM

This revision is now accepted and ready to land.Tue, Sep 30, 11:37 PM

We should also MFC it before the BETA build begins rather than 3 days.

In D52808#1206681, @bofh wrote:

We should also MFC it before the BETA build begins rather than 3 days.

@cperciva are you ok with an insta-MFC? this is the bug that broke the release build in main because ncurses-all.ucl contained the string * "Software".