Message ID | 20180613023728.202173-3-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Simon Glass |
Headers | show |
Series | efi: Enable basic sandbox support for EFI loader | expand |
On 06/13/2018 04:37 AM, Simon Glass wrote: > The current code causes a compiler error on gcc 4.8.4 as used by sandbox > on Ubuntu 14.04, which is fairly recent. Init these variables to fix the > problem. > > Signed-off-by: Simon Glass <sjg@chromium.org> I thought this patch was obsolete now? Alex
Hi Alex, On 14 June 2018 at 04:11, Alexander Graf <agraf@suse.de> wrote: > On 06/13/2018 04:37 AM, Simon Glass wrote: >> >> The current code causes a compiler error on gcc 4.8.4 as used by sandbox >> on Ubuntu 14.04, which is fairly recent. Init these variables to fix the >> problem. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> > > > I thought this patch was obsolete now? > > Alex > Yes Heinrich pointed out that it isn't needed now. Regards, Simon
diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index ce66c935ec..bd953a1485 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -204,8 +204,11 @@ static int query_console_serial(int *rows, int *cols) return -1; /* Read {depth,rows,cols} */ - if (term_read_reply(n, 3, 't')) + if (term_read_reply(n, 3, 't')) { + *rows = -1; + *cols = -1; return -1; + } *cols = n[2]; *rows = n[1];
The current code causes a compiler error on gcc 4.8.4 as used by sandbox on Ubuntu 14.04, which is fairly recent. Init these variables to fix the problem. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v6: None Changes in v5: None Changes in v4: - Move the fix to query_console_serial() Changes in v3: - Add new patch to init the 'rows' and 'cols' variables Changes in v2: None lib/efi_loader/efi_console.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)