mirror of
https://github.com/chromium/crashpad.git
synced 2025-03-10 06:36:02 +00:00
a8ff626764
There are a few files in the tree which use various functions defined in string.h (memcpy, strlen, strnlen, memmove, etc), but never include the necessary header file. After I've recently updated one of my systems to a newer glibc version (2.30) this code failed to build. Adding the missing includes fixes the problem. The undeclared functions for each file are: * simple_address_range_bag.h - memcpy * http_multipart_builder.cc - strlen * minidump_context_converter.cc - memcpy * ptrace_client.cc - strlen * http_transport_socket.cc - strncpy, strlen, memcpy * process_memory.cc - memchr * log_output_stream.cc - strlen Change-Id: I3108c36b8a6927ac11f6839606cb495926fa9e4e Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2207139 Reviewed-by: Mark Mentovai <mark@chromium.org> Commit-Queue: Mark Mentovai <mark@chromium.org>
96 lines
2.6 KiB
C++
96 lines
2.6 KiB
C++
// Copyright 2018 The Crashpad Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "util/process/process_memory.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <algorithm>
|
|
|
|
#include "base/logging.h"
|
|
#include "util/numeric/safe_assignment.h"
|
|
|
|
namespace crashpad {
|
|
|
|
bool ProcessMemory::Read(VMAddress address, VMSize size, void* buffer) const {
|
|
size_t local_size;
|
|
if (!AssignIfInRange(&local_size, size)) {
|
|
LOG(ERROR) << "size " << size << " out of bounds for size_t";
|
|
return false;
|
|
}
|
|
|
|
char* buffer_c = static_cast<char*>(buffer);
|
|
while (local_size > 0) {
|
|
ssize_t bytes_read = ReadUpTo(address, local_size, buffer_c);
|
|
if (bytes_read < 0) {
|
|
return false;
|
|
}
|
|
if (bytes_read == 0) {
|
|
LOG(ERROR) << "short read";
|
|
return false;
|
|
}
|
|
DCHECK_LE(static_cast<size_t>(bytes_read), local_size);
|
|
local_size -= bytes_read;
|
|
address += bytes_read;
|
|
buffer_c += bytes_read;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool ProcessMemory::ReadCStringInternal(VMAddress address,
|
|
bool has_size,
|
|
VMSize size,
|
|
std::string* string) const {
|
|
size_t local_size;
|
|
if (!AssignIfInRange(&local_size, size)) {
|
|
LOG(ERROR) << "size " << size << " out of bounds for size_t";
|
|
return false;
|
|
}
|
|
|
|
string->clear();
|
|
|
|
char buffer[4096];
|
|
do {
|
|
size_t read_size;
|
|
if (has_size) {
|
|
read_size = std::min(sizeof(buffer), local_size);
|
|
} else {
|
|
read_size = sizeof(buffer);
|
|
}
|
|
|
|
ssize_t bytes_read = ReadUpTo(address, read_size, buffer);
|
|
if (bytes_read < 0) {
|
|
return false;
|
|
}
|
|
if (bytes_read == 0) {
|
|
break;
|
|
}
|
|
|
|
char* nul = static_cast<char*>(memchr(buffer, '\0', bytes_read));
|
|
if (nul != nullptr) {
|
|
string->append(buffer, nul - buffer);
|
|
return true;
|
|
}
|
|
string->append(buffer, bytes_read);
|
|
|
|
address += bytes_read;
|
|
local_size -= bytes_read;
|
|
} while (!has_size || local_size > 0);
|
|
|
|
LOG(ERROR) << "unterminated string";
|
|
return false;
|
|
}
|
|
|
|
} // namespace crashpad
|