ChrisRohlf commited on
Commit
9a5c3ef
·
1 Parent(s): e9f5612

rpc : check for null buffers in get/set/copy tensor endpoints (llama/14868)

Browse files
Files changed (1) hide show
  1. ggml/src/ggml-rpc/ggml-rpc.cpp +4 -4
ggml/src/ggml-rpc/ggml-rpc.cpp CHANGED
@@ -1055,7 +1055,7 @@ bool rpc_server::set_tensor(const std::vector<uint8_t> & input) {
1055
  GGML_ASSERT(ctx_ptr != nullptr);
1056
  ggml_context * ctx = ctx_ptr.get();
1057
  ggml_tensor * tensor = deserialize_tensor(ctx, in_tensor);
1058
- if (tensor == nullptr) {
1059
  GGML_LOG_ERROR("[%s] error deserializing tensor\n", __func__);
1060
  return false;
1061
  }
@@ -1124,7 +1124,7 @@ bool rpc_server::set_tensor_hash(const rpc_msg_set_tensor_hash_req & request, rp
1124
  GGML_ASSERT(ctx_ptr != nullptr);
1125
  ggml_context * ctx = ctx_ptr.get();
1126
  ggml_tensor * tensor = deserialize_tensor(ctx, &request.tensor);
1127
- if (tensor == nullptr) {
1128
  GGML_LOG_ERROR("[%s] error deserializing tensor\n", __func__);
1129
  return false;
1130
  }
@@ -1192,7 +1192,7 @@ bool rpc_server::get_tensor(const rpc_msg_get_tensor_req & request, std::vector<
1192
  GGML_ASSERT(ctx_ptr != nullptr);
1193
  ggml_context * ctx = ctx_ptr.get();
1194
  ggml_tensor * tensor = deserialize_tensor(ctx, &request.tensor);
1195
- if (tensor == nullptr) {
1196
  GGML_LOG_ERROR("[%s] error deserializing tensor\n", __func__);
1197
  return false;
1198
  }
@@ -1229,7 +1229,7 @@ bool rpc_server::copy_tensor(const rpc_msg_copy_tensor_req & request, rpc_msg_co
1229
 
1230
  ggml_tensor * src = deserialize_tensor(ctx, &request.src);
1231
  ggml_tensor * dst = deserialize_tensor(ctx, &request.dst);
1232
- if (src == nullptr || dst == nullptr) {
1233
  GGML_LOG_ERROR("[%s] error deserializing tensors\n", __func__);
1234
  return false;
1235
  }
 
1055
  GGML_ASSERT(ctx_ptr != nullptr);
1056
  ggml_context * ctx = ctx_ptr.get();
1057
  ggml_tensor * tensor = deserialize_tensor(ctx, in_tensor);
1058
+ if (tensor == nullptr || tensor->buffer == nullptr) {
1059
  GGML_LOG_ERROR("[%s] error deserializing tensor\n", __func__);
1060
  return false;
1061
  }
 
1124
  GGML_ASSERT(ctx_ptr != nullptr);
1125
  ggml_context * ctx = ctx_ptr.get();
1126
  ggml_tensor * tensor = deserialize_tensor(ctx, &request.tensor);
1127
+ if (tensor == nullptr || tensor->buffer == nullptr) {
1128
  GGML_LOG_ERROR("[%s] error deserializing tensor\n", __func__);
1129
  return false;
1130
  }
 
1192
  GGML_ASSERT(ctx_ptr != nullptr);
1193
  ggml_context * ctx = ctx_ptr.get();
1194
  ggml_tensor * tensor = deserialize_tensor(ctx, &request.tensor);
1195
+ if (tensor == nullptr || tensor->buffer == nullptr) {
1196
  GGML_LOG_ERROR("[%s] error deserializing tensor\n", __func__);
1197
  return false;
1198
  }
 
1229
 
1230
  ggml_tensor * src = deserialize_tensor(ctx, &request.src);
1231
  ggml_tensor * dst = deserialize_tensor(ctx, &request.dst);
1232
+ if (src == nullptr || dst == nullptr || src->buffer == nullptr || dst->buffer == nullptr) {
1233
  GGML_LOG_ERROR("[%s] error deserializing tensors\n", __func__);
1234
  return false;
1235
  }