Merge pull request #2192 from bugsnag/tms/macos-15

Move CI jobs to macOS 15

Author: twometresteve

.buildkite/pipeline.full.yml

@@ -6,7 +6,7 @@ steps:
     key: "fixture-minimal"
     timeout_in_minutes: 30
     agents:
-      queue: macos-14
+      queue: macos-15
     artifact_paths: build/fixture-minimal.apk
     command: make fixture-minimal
     env:
@@ -15,7 +15,7 @@ steps:
   - label: ':android: Build Example App'
     timeout_in_minutes: 10
     agents:
-      queue: macos-14
+      queue: macos-15
     command: 'make example-app'
     env:
       JAVA_VERSION: 17
@@ -24,7 +24,7 @@ steps:
     key: "fixture-debug"
     timeout_in_minutes: 30
     agents:
-      queue: macos-14
+      queue: macos-15
     artifact_paths:
       - "build/fixture-debug.apk"
       - "build/fixture-debug/*"
@@ -35,7 +35,7 @@ steps:
   - label: ':android: Build Scan'
     timeout_in_minutes: 10
     agents:
-      queue: macos-14
+      queue: macos-15
     command: './gradlew clean assembleRelease check --scan'
 
   #

.buildkite/pipeline.yml

@@ -6,7 +6,7 @@ steps:
   - label: 'Audit current licenses'
     timeout_in_minutes: 30
     agents:
-      queue: macos-14
+      queue: macos-15
     commands:
       - bundle install
       - ./scripts/audit-dependency-licenses.sh
@@ -15,7 +15,7 @@ steps:
     key: "fixture-r19"
     timeout_in_minutes: 30
     agents:
-      queue: macos-14
+      queue: macos-15
     artifact_paths:
       - "build/fixture-r19.apk"
       - "build/fixture-r19-url.txt"
@@ -33,7 +33,7 @@ steps:
     key: "fixture-r21"
     timeout_in_minutes: 30
     agents:
-      queue: macos-14
+      queue: macos-15
     artifact_paths:
       - "build/fixture-r21.apk"
       - "build/fixture-r21-url.txt"
@@ -50,31 +50,31 @@ steps:
   - label: ':android: Coding standards checks'
     timeout_in_minutes: 20
     agents:
-      queue: macos-14
+      queue: macos-15
     command: './gradlew --continue checkstyle detekt lint ktlintCheck'
 
   - label: ':android: Binary compatibility checks'
     timeout_in_minutes: 20
     agents:
-      queue: macos-14
+      queue: macos-15
     command: './gradlew apiCheck'
 
   - label: ':android: CppCheck'
     timeout_in_minutes: 10
     agents:
-      queue: macos-14
+      queue: macos-15
     command: 'bash ./scripts/run-cpp-check.sh'
 
   - label: ':android: ClangFormat'
     timeout_in_minutes: 10
     agents:
-      queue: macos-14
+      queue: macos-15
     command: 'bash ./scripts/run-clang-format-ci-check.sh'
 
   - label: ':android: Lint mazerunner scenarios'
     timeout_in_minutes: 10
     agents:
-      queue: macos-14
+      queue: macos-15
     commands:
       - cd features/fixtures/mazerunner
       - ./gradlew ktlintCheck detekt checkstyle
@@ -84,13 +84,13 @@ steps:
   - label: ':android: Android size reporting'
     timeout_in_minutes: 10
     agents:
-      queue: macos-14
+      queue: macos-15
     command: scripts/run-sizer.sh
 
   - label: ':android: JVM tests'
     timeout_in_minutes: 10
     agents:
-      queue: macos-14
+      queue: macos-15
     command: './gradlew test'
 
   - label: ':android: Instrumentation tests'
@@ -99,7 +99,7 @@ steps:
       artifacts#v1.9.0:
         upload: "bugsnag-*/build/reports/androidTests/connected/**/*.html"
     agents:
-      queue: macos-14-isolated
+      queue: macos-15-isolated
     command: './scripts/run-connected-checks.rb'
     env:
       API_LEVEL: 30

CHANGELOG.md

@@ -7,6 +7,11 @@
 * Allow the metadata in `leaveBreadcrumb` to be null rather than enforcing non-null, aligning `bugsnag-android` with our other SDKs
   [#2180](https://github.com/bugsnag/bugsnag-android/pull/2180)
 
+### Bug fixes
+
+* Sanity check the allocation in the installation of `bugsnag-plugin-android-ndk` to avoid a possible crash when allocation fails
+  [#2191](https://github.com/bugsnag/bugsnag-android/pull/2191)
+
 ## 6.13.0 (2025-04-15)
 
 ### Enhancements

bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.c

@@ -164,6 +164,11 @@ JNIEXPORT void JNICALL Java_com_bugsnag_android_ndk_NativeBridge_install(
   }
 
   bsg_environment *bugsnag_env = calloc(1, sizeof(bsg_environment));
+  if (bugsnag_env == NULL) {
+    BUGSNAG_LOG("Failed to allocate memory for bsg_environment");
+    return;
+  }
+
   bsg_unwinder_init();
   bugsnag_env->report_header.big_endian =
       htonl(47) == 47; // potentially too clever, see man 3 htonl
@@ -328,6 +333,10 @@ JNIEXPORT void JNICALL Java_com_bugsnag_android_ndk_NativeBridge_addBreadcrumb(
 
   if (name != NULL && timestamp != NULL) {
     bugsnag_breadcrumb *crumb = calloc(1, sizeof(bugsnag_breadcrumb));
+    if (crumb == NULL) {
+      goto end;
+    }
+
     bsg_strncpy(crumb->name, name, sizeof(crumb->name));
     bsg_strncpy(crumb->timestamp, timestamp, sizeof(crumb->timestamp));