OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rimage.c: add assert(image.adsp->write_firmware[_meu]) 

This makes the write_firmware NULL pointer added by commit
dd77445f01 and corresponding crash more user-friendly.
Before:

  Program received signal SIGSEGV, Segmentation fault.

After:

  rimage: src/rimage.c:197: main: Assertion `image.adsp->write_firmware'
  failed.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2020-06-15 22:28:40 -07:00 committed by Liam Girdwood
parent 4348e2a2bd
commit 2156dcb00d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rimage.c
View File

@ -2,6 +2,7 @@
//
// Copyright(c) 2015 Intel Corporation. All rights reserved.
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
@ -189,10 +190,13 @@ found:
}
/* process and write output */
if (image.meu_offset)
if (image.meu_offset) {
assert(image.adsp->write_firmware_meu);
ret = image.adsp->write_firmware_meu(&image);
else
} else {
assert(image.adsp->write_firmware);
ret = image.adsp->write_firmware(&image);
}
if (ret)
goto out;