diff options
| author | cathook <cat.hook31894@gmail.com> | 2013-11-26 00:46:18 +0800 |
|---|---|---|
| committer | cathook <cat.hook31894@gmail.com> | 2013-11-26 00:46:18 +0800 |
| commit | 32939724ab1158ed616f800086eefa32d3a93a3f (patch) | |
| tree | 8815aaf4aa8f205c1be62acb42c25fc7ca6e1de3 | |
| parent | 19eb6173b7b3bdd3bbcec6b2ee15c6f52bad6ad9 (diff) | |
| parent | a4438b8d63a788719bbbc24c3deb1f7e2d52a51f (diff) | |
| download | ctl-32939724ab1158ed616f800086eefa32d3a93a3f.tar.gz ctl-32939724ab1158ed616f800086eefa32d3a93a3f.tar.zst ctl-32939724ab1158ed616f800086eefa32d3a93a3f.zip | |
Merge branch 'feature-vector'
| -rw-r--r-- | src/vector.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/vector.c b/src/vector.c index 37c1fa7..4f8446c 100644 --- a/src/vector.c +++ b/src/vector.c @@ -117,9 +117,11 @@ int ctl_vector_catX(ppvoid v, ppcvoid v2){ pvoid ctl_vector_copyX(ppvoid v, ppcvoid v2){ VectorHeader *tmp = getHeader(*v2); pvoid p = malloc(getTotal(tmp)); - memcpy(p, tmp, getTotal(tmp)); - if(*v != NULL){ - ctl_vector_free(v); + memcpy(p, pVoid(tmp), getTotal(tmp)); + if(v != NULL){ + if(*v != NULL){ + ctl_vector_free(v); + } *v = p; } return p; |