llama_control_vector_load: free gguf_context before ggml_context

ggml-org · Mar 26, 2024 · d0304f7 · d0304f7
1 parent 9914014
commit d0304f7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/common/common.cpp b/common/common.cpp
@@ -2673,40 +2673,40 @@ static llama_control_vector_data llama_control_vector_load_one(const llama_contr
                     uint32_t layer = std::stoi(name.substr(dotpos + 1));
                     if (layer == 0) {
                         fprintf(stderr, "%s: direction tensor invalid in %s\n", __func__, load_info.fname.c_str());
-                        ggml_free(meta_ctx);
                         gguf_free(meta_ctx_gguf);
+                        ggml_free(meta_ctx);
                         return result;
                     }
                     if (layer > max_direction_layer) {
                         max_direction_layer = layer;
                     }
                 } catch (...) {
                     fprintf(stderr, "%s: direction tensor invalid in %s\n", __func__, load_info.fname.c_str());
-                    ggml_free(meta_ctx);
                     gguf_free(meta_ctx_gguf);
+                    ggml_free(meta_ctx);
                     return result;
                 }
             }
 
             struct ggml_tensor * tensor_meta = ggml_get_tensor(meta_ctx, name.c_str());
             if (tensor_meta->type != GGML_TYPE_F32 || ggml_n_dims(tensor_meta) != 1) {
                 fprintf(stderr, "%s: direction tensor invalid in %s\n", __func__, load_info.fname.c_str());
-                ggml_free(meta_ctx);
                 gguf_free(meta_ctx_gguf);
+                ggml_free(meta_ctx);
                 return result;
             }
             if (result.n_embd == -1) {
                 result.n_embd = ggml_nelements(tensor_meta);
             } else if (ggml_nelements(tensor_meta) != result.n_embd) {
                 fprintf(stderr, "%s: direction tensor sizes mismatched in %s\n", __func__, load_info.fname.c_str());
-                ggml_free(meta_ctx);
                 gguf_free(meta_ctx_gguf);
+                ggml_free(meta_ctx);
                 return result;
             }
             n_bytes += ggml_nbytes(tensor_meta);
         }
-        ggml_free(meta_ctx);
         gguf_free(meta_ctx_gguf);
+        ggml_free(meta_ctx);
     }
 
     if (n_tensors == 0) {