crash-reporter: fix bug where we were sending "undefined" as all stack signatures

crash_sender

 #!/bin/sh
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -e
 
 # Product ID in crash report
 CHROMEOS_PRODUCT=ChromeOS
@@ skipping 143 matching lines @@
 
 get_extension() {
   echo "${1##*.}"
 }
 
 # Return which kind of report the given metadata file relates to
 get_kind() {
   local payload="$(get_key_value "$1" "payload")"
   if [ ! -r "${payload}" ]; then
     lecho "Missing payload: ${payload}"
-    echo "unknown"
+    echo "undefined"
     return
   fi
   local kind="$(get_extension "${payload}")"
   if [ "${kind}" = "dmp" ]; then
     echo "minidump"
     return
   fi
   echo "${kind}"
 }
 
 get_key_value() {
   if ! grep -q "$2=" "$1"; then
     echo "undefined"
     return
   fi
   grep "$2=" "$1" | cut -d = -f 2-
 }
 
 # Return the board name.
 get_board() {
   echo $(get_key_value "/etc/lsb-release" "CHROMEOS_RELEASE_BOARD")
 }
 
-# Return the hardware class or "unknown".
+# Return the hardware class or "undefined".
 get_hardware_class() {
   if [ -r "${HWCLASS_PATH}" ]; then
     cat "${HWCLASS_PATH}"
   else
-    echo "unknown"
+    echo "undefined"
   fi
 }
 
 send_crash() {
   local meta_path="$1"
   local report_payload="$(get_key_value "${meta_path}" "payload")"
   local kind="$(get_kind "${meta_path}")"
   local exec_name="$(get_key_value "${meta_path}" "exec_name")"
   local sleep_time=$(generate_uniform_random $SECONDS_SEND_SPREAD)
   local url="${REPORT_UPLOAD_PROD_URL}"
   local chromeos_version="$(get_key_value "${meta_path}" "ver")"
   local board="$(get_board)"
   local hwclass="$(get_hardware_class)"
   local write_payload_size="$(get_key_value "${meta_path}" "payload_size")"
   local sig="$(get_key_value "${meta_path}" "sig")"
   local send_payload_size="$(stat --printf=%s "${report_payload}" 2>/dev/null)"
+
+  local extra_key1="write_payload_size"
+  local extra_value1="${write_payload_size}"
+  local extra_key2="send_payload_size"
+  local extra_value2="${send_payload_size}"
+  if [ "${sig}" != "undefined" ]; then
+    extra_key1="sig"
+    extra_value1="${sig}"
+    extra_key2="sig2"
+    extra_value2="${sig}"
+  fi
+
   lecho "Sending crash:"
   lecho "  Scheduled to send in ${sleep_time}s"
   lecho "  Metadata: ${meta_path} (${kind})"
   lecho "  Payload: ${report_payload}"
   lecho "  Version: ${chromeos_version}"
   if is_mock; then
     lecho "  Product: ${CHROMEOS_PRODUCT}"
     lecho "  URL: ${url}"
     lecho "  Board: ${board}"
     lecho "  HWClass: ${hwclass}"
-    [ "${sig}" != "undefined" ] && lecho "  Sig: ${sig}"
+    lecho "  ${extra_key1}: ${extra_value1}"
+    lecho "  ${extra_key2}: ${extra_value2}"
   fi
   lecho "  Exec name: ${exec_name}"
   if is_mock; then
     local mock_in=$(cat "${MOCK_CRASH_SENDING}")
     if [ "${mock_in}" = "" ]; then
       lecho "Mocking successful send"
       return 0
     else
       lecho "Mocking unsuccessful send"
       return 1
     fi
   fi
 
   if ! sleep ${sleep_time}; then
     lecho "Sleep failed"
     return 1
   fi
 
   local report_id="${TMP_DIR}/report_id"
   local curl_stderr="${TMP_DIR}/curl_stderr"
 
-  local extra_key1="write_payload_size"
-  local extra_value1="${write_payload_size}"
-  local extra_key2="send_payload_size"
-  local extra_value2="${send_payload_size}"
-  if [ "${sig}" != "unknown" ]; then
-    extra_key1="sig"
-    extra_value1="${sig}"
-    extra_key2="sig2"
-    extra_value2="${sig}"
-  fi
-
   set +e
   curl "${url}" \
     -F "prod=${CHROMEOS_PRODUCT}" \
     -F "ver=${chromeos_version}" \
     -F "upload_file_${kind}=@${report_payload}" \
     -F "board=${board}" \
     -F "hwclass=${hwclass}" \
     -F "exec_name=${exec_name}" \
     -F "${extra_key1}=${extra_value1}" \
     -F "${extra_key2}=${extra_value2}" \
@@ skipping 127 matching lines @@
   TMP_DIR="$(mktemp -d /tmp/crash_sender.XXXX)"
 
   # Send system-wide crashes
   send_crashes "/var/spool/crash"
 
   # Send user-specific crashes
   send_crashes "/home/chronos/user/crash"
 }
 
 main