Ubuntu Application Launcher

Merge lp:~ted/ubuntu-app-launch/check-for-apps-array into lp:ubuntu-app-launch/16.10

  1. check-for-apps-array
  2. Merge into trunk.16.10
Proposed by Ted Gould
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 256
Merged at revision: 262
Proposed branch: lp:~ted/ubuntu-app-launch/check-for-apps-array
Merge into: lp:ubuntu-app-launch/16.10
Diff against target: 11 lines (+1/-1)
1 file modified
libubuntu-app-launch/snapd-info.cpp (+1/-1)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/check-for-apps-array
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+306665@code.launchpad.net

Commit message

Ensure we don't check the length of a nullptr array

Description of the change

Make sure we don't see this when debugging:

(process:7020): Json-CRITICAL **: json_array_get_length: assertion 'array != NULL' failed

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:256
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/104/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/763
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/769
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/577/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/104/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntu-app-launch/snapd-info.cpp'
2--- libubuntu-app-launch/snapd-info.cpp 2016-08-26 21:05:26 +0000
3+++ libubuntu-app-launch/snapd-info.cpp 2016-09-23 19:13:05 +0000
4@@ -398,7 +398,7 @@
5 std::string revision = pkginfo->revision;
6
7 auto apps = json_object_get_array_member(ifaceobj, "apps");
8- for (unsigned int k = 0; k < json_array_get_length(apps); k++)
9+ for (unsigned int k = 0; apps != nullptr && k < json_array_get_length(apps); k++)
10 {
11 std::string appname = json_array_get_string_element(apps, k);
12

Subscribers

People subscribed via source and target branches