Fossil SCM
Use sqlite3_snprintf instead because it guarantees that the buffer will be zero-terminated and to avoid warnings on OpenBSD.
Commit
460b93b53e5f0c385382ca92587319008e6f10bf
Parent
55f3f3d42d54618…
1 file changed
+3
-3
+3
-3
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -144,13 +144,13 @@ | ||
| 144 | 144 | if(!zUuid){ |
| 145 | 145 | fossil_trace("Undefined rid=%d\n", rid); |
| 146 | 146 | return -1; |
| 147 | 147 | } |
| 148 | 148 | mark->rid = rid; |
| 149 | - sprintf(sid, ":%d", COMMITMARK(rid)); | |
| 149 | + sqlite3_snprintf(sizeof(sid), sid, ":%d", COMMITMARK(rid)); | |
| 150 | 150 | mark->name = fossil_strdup(sid); |
| 151 | - strcpy(mark->uuid, zUuid); | |
| 151 | + sqlite3_snprintf(sizeof(mark->uuid), mark->uuid, "%s", zUuid); | |
| 152 | 152 | free(zUuid); |
| 153 | 153 | insert_commit_xref(mark->rid, mark->name, mark->uuid); |
| 154 | 154 | return 0; |
| 155 | 155 | } |
| 156 | 156 | |
| @@ -213,11 +213,11 @@ | ||
| 213 | 213 | if(!cur_tok||strlen(cur_tok)!=40){ |
| 214 | 214 | free(mark->name); |
| 215 | 215 | fossil_trace("Invalid SHA-1 in marks file: %s\n", cur_tok); |
| 216 | 216 | return -1; |
| 217 | 217 | }else{ |
| 218 | - strcpy(mark->uuid, cur_tok); | |
| 218 | + sqlite3_snprintf(sizeof(mark->uuid), mark->uuid, "%s", cur_tok); | |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | /* make sure that rid corresponds to UUID */ |
| 222 | 222 | if(fast_uuid_to_rid(mark->uuid)!=mark->rid){ |
| 223 | 223 | free(mark->name); |
| 224 | 224 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -144,13 +144,13 @@ | |
| 144 | if(!zUuid){ |
| 145 | fossil_trace("Undefined rid=%d\n", rid); |
| 146 | return -1; |
| 147 | } |
| 148 | mark->rid = rid; |
| 149 | sprintf(sid, ":%d", COMMITMARK(rid)); |
| 150 | mark->name = fossil_strdup(sid); |
| 151 | strcpy(mark->uuid, zUuid); |
| 152 | free(zUuid); |
| 153 | insert_commit_xref(mark->rid, mark->name, mark->uuid); |
| 154 | return 0; |
| 155 | } |
| 156 | |
| @@ -213,11 +213,11 @@ | |
| 213 | if(!cur_tok||strlen(cur_tok)!=40){ |
| 214 | free(mark->name); |
| 215 | fossil_trace("Invalid SHA-1 in marks file: %s\n", cur_tok); |
| 216 | return -1; |
| 217 | }else{ |
| 218 | strcpy(mark->uuid, cur_tok); |
| 219 | } |
| 220 | |
| 221 | /* make sure that rid corresponds to UUID */ |
| 222 | if(fast_uuid_to_rid(mark->uuid)!=mark->rid){ |
| 223 | free(mark->name); |
| 224 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -144,13 +144,13 @@ | |
| 144 | if(!zUuid){ |
| 145 | fossil_trace("Undefined rid=%d\n", rid); |
| 146 | return -1; |
| 147 | } |
| 148 | mark->rid = rid; |
| 149 | sqlite3_snprintf(sizeof(sid), sid, ":%d", COMMITMARK(rid)); |
| 150 | mark->name = fossil_strdup(sid); |
| 151 | sqlite3_snprintf(sizeof(mark->uuid), mark->uuid, "%s", zUuid); |
| 152 | free(zUuid); |
| 153 | insert_commit_xref(mark->rid, mark->name, mark->uuid); |
| 154 | return 0; |
| 155 | } |
| 156 | |
| @@ -213,11 +213,11 @@ | |
| 213 | if(!cur_tok||strlen(cur_tok)!=40){ |
| 214 | free(mark->name); |
| 215 | fossil_trace("Invalid SHA-1 in marks file: %s\n", cur_tok); |
| 216 | return -1; |
| 217 | }else{ |
| 218 | sqlite3_snprintf(sizeof(mark->uuid), mark->uuid, "%s", cur_tok); |
| 219 | } |
| 220 | |
| 221 | /* make sure that rid corresponds to UUID */ |
| 222 | if(fast_uuid_to_rid(mark->uuid)!=mark->rid){ |
| 223 | free(mark->name); |
| 224 |