diff options
author | Raquel Medina <raquel.medina@konsulko.com> | 2019-10-31 14:29:36 +0100 |
---|---|---|
committer | Raquel Medina <raquel.medina@konsulko.com> | 2019-10-31 15:26:46 +0100 |
commit | 08773d9a9cfaea8c8480260141b7c18f6e36f079 (patch) | |
tree | 0d6bb73b6f2f7f15e360f3f34a65eeb8c3fc89b8 | |
parent | a765be206e7379885c8df72f4ff89b6e0bf14e1e (diff) |
alexa-voice-agent-service: fix segmentation fault in release mode
Bug-AGL: SPEC-2873
Change-Id: I3ada1a89e57aa879667e2a204a5f7572a59201ed
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0005-fix-segmentation-fault-for-release-build-mode.patch b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0005-fix-segmentation-fault-for-release-build-mode.patch new file mode 100644 index 00000000..5012dfe8 --- /dev/null +++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0005-fix-segmentation-fault-for-release-build-mode.patch @@ -0,0 +1,33 @@ +Fix segmentation fault for release build mode + +'int IAFBApi::callSync(...)' is missing a return +statement. When the sdk is compiled in release mode +executing this code results in a segmentation fault. + +According to the C++ standard, a return statement is +required on a function that returns a non-void value. +Specifically: <<Flowing off the end of a function is +equivalent to a return with no value; this results in +undefined behaviour in a value-returning function.>> + +The proposed fix provides the missing return statement +for IAFBApi's callSync method. + +Upstream-Status: Pending + +Signed-off-by: Raquel Medina <raquel.medina@konsulko.com> + +diff --git a/platforms/agl/alexa-voiceagent-service/src/plugins/afb/AFBApiImpl.cpp b/platforms/agl/alexa-voiceagent-service/src/plugins/afb/AFBApiImpl.cpp +index 5ed9bce..e68ef7f 100644 +--- a/src/plugins/afb/AFBApiImpl.cpp ++++ b/src/plugins/afb/AFBApiImpl.cpp +@@ -77,6 +77,8 @@ int AFBApiImpl::callSync( + info = infoStr; + free(infoStr); + } ++ ++ return rc; + } + + /// Shim to transfer C++ function to C callback using void* + diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb index 939a631c..97c168d4 100644 --- a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb +++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb @@ -25,6 +25,7 @@ SRC_URI = "git://github.com/alexa/alexa-auto-sdk.git;protocol=https;branch=2.0 \ file://0002-update-config.xml.in.patch \ file://0003-update-audio-device-configuration.patch \ file://0004-update-config-and-database-paths.patch \ + file://0005-fix-segmentation-fault-for-release-build-mode.patch \ " SRCREV = "86916d2d8c1702a8be3c88a9012ca56583bcc0c8" |