summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* tree: use the sorted update list in our loopCarlos Martín Nieto2016-11-141-2/+2
| | | | | The loop is made with the assumption that the inputs are sorted and not using it leads to bad outputs.
* tree: add a failing test for unsorted inputCarlos Martín Nieto2016-11-141-0/+57
| | | | | We do not currently use the sorted version of this input in the function, which means we produce bad results.
* Merge pull request #4002 from pks-t/pks/giterr-formatCarlos Martín Nieto2016-11-1410-43/+44
|\ | | | | giterr format
| * path: pass string instead of git_buf to giterr_setPatrick Steinhardt2016-11-141-1/+1
| |
| * checkout: pass string instead of git_buf to `giterr_set`Patrick Steinhardt2016-11-141-2/+2
| |
| * common: cast precision specifiers to intPatrick Steinhardt2016-11-142-3/+3
| |
| * common: use PRIuZ for size_t in `giterr_set` callsPatrick Steinhardt2016-11-145-36/+36
| |
| * common: mark printf-style formatting for `giterr_set`Patrick Steinhardt2016-11-141-1/+2
| |
* | Merge pull request #3983 from pks-t/pks/smart-early-eofCarlos Martín Nieto2016-11-142-3/+7
|\ \ | | | | | | transports: smart: abort on early end of stream
| * | transports: smart: abort receiving packets on end of streamPatrick Steinhardt2016-11-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to receive packets from the remote, we loop until either an error distinct to `GIT_EBUFS` occurs or until we successfully parsed the packet. This does not honor the case where we are looping over an already closed socket which has no more data, leaving us in an infinite loop if we got a bogus packet size or if the remote hang up. Fix the issue by returning `GIT_EEOF` when we cannot read data from the socket anymore.
| * | transports: smart: abort ref announcement on early end of streamPatrick Steinhardt2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading a server's reference announcements via the smart protocol, we expect the server to send multiple flushes before the protocol is finished. If we fail to receive new data from the socket, we will only return an end of stream error if we have not seen any flush yet. This logic is flawed in that we may run into an infinite loop when receiving a server's reference announcement with a bogus flush packet. E.g. assume the last flushing package is changed to not be '0000' but instead any other value. In this case, we will still await one more flush package and ignore the fact that we are not receiving any data from the socket, causing an infinite loop. Fix the issue by always returning `GIT_EEOF` if the socket indicates an end of stream.
| * | proxy: fix typo in documentationPatrick Steinhardt2016-11-011-1/+1
| | |
* | | Merge pull request #3985 from libgit2/cmn/threading-updateCarlos Martín Nieto2016-11-141-22/+24
|\ \ \ | | | | | | | | Update THREADING for OpenSSL 1.1
| * | | THREADING: OpenSSL 1.1 is thead-safe, rework some paragraphscmn/threading-updateCarlos Martín Nieto2016-11-041-22/+24
| | | |
| * | | THREADING: update cURL thread safety linkCarlos Martín Nieto2016-11-021-1/+1
| | | |
* | | | Merge pull request #3992 from joshtriplett/env-namespacePatrick Steinhardt2016-11-141-5/+8
|\ \ \ \ | |_|_|/ |/| | | git_repository_open_ext: fix handling of $GIT_NAMESPACE
| * | | git_repository_open_ext: fix handling of $GIT_NAMESPACEJosh Triplett2016-11-111-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing code would set a namespace of "" (empty string) with GIT_NAMESPACE unset. In a repository where refs/heads/namespaces/ exists, that can produce incorrect results. Detect that case and avoid setting the namespace at all. Since that makes the last assignment to error conditional, and the previous assignment can potentially get GIT_ENOTFOUND, set error to 0 explicitly to prevent the call from incorrectly failing with GIT_ENOTFOUND.
* | | | Merge pull request #4001 from pks-t/pks/fileops-docs-typoPatrick Steinhardt2016-11-141-2/+2
|\ \ \ \ | | | | | | | | | | fileops: fix typos in `git_futils_creat_locked{,with_path}`
| * | | | fileops: fix typos in `git_futils_creat_locked{,with_path}`Patrick Steinhardt2016-11-141-2/+2
|/ / / /
* | | | Merge pull request #3993 from alexcrichton/fix-faultPatrick Steinhardt2016-11-111-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | curl_stream: check for -1 after CURLINFO_LASTSOCKETAlex Crichton2016-11-111-0/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're recently trying to upgrade to the current master of libgit2 in Cargo but we're unfortunately hitting a segfault in one of our tests. This particular test is just a small smoke test that https works (e.g. it's configured in libgit2). It attempts to clone from a URL which simply immediately drops connections after they're accepted (e.g. terminate abnormally). We expect to see a standard error from libgit2 but unfortunately we're seeing a segfault. This segfault is happening inside of the `wait_for` function of `curl_stream.c` at the line `FD_SET(fd, &errfd)` because `fd` is -1. This ends up doing an out-of-bounds array access that faults the program. I tracked back to where this -1 came from to the line here (returned by `CURLINFO_LASTSOCKET`) and added a check to return an error.
* | | Merge pull request #3974 from libgit2/pks/synchronize-shutdownPatrick Steinhardt2016-11-042-4/+59
|\ \ \ | | | | | | | | global: synchronize initialization and shutdown with pthreads
| * | | tests: core: test deinitialization and concurrent initializationpks/synchronize-shutdownPatrick Steinhardt2016-11-021-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exercise the logic surrounding deinitialization of the libgit2 library as well as repeated concurrent de- and reinitialization. This tries to catch races and makes sure that it is possible to reinitialize libgit2 multiple times. After deinitializing libgit2, we have to make sure to setup options required for testing. Currently, this only includes setting up the configuration search path again. Before, this has been set up once in `tests/main.c`.
| * | | global: reset global state on shutdown without threadingPatrick Steinhardt2016-11-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When threading is not enabled for libgit2, we keep global state in a simple static variable. When libgit2 is shut down, we clean up the global state by freeing the global state's dynamically allocated memory. When libgit2 is built with threading, we additionally free the thread-local storage and thus completely remove the global state. In a non-threaded build, though, we simply leave the global state as-is, which may result in an error upon reinitializing libgit2. Fix the issue by zeroing out the variable on a shutdown, thus returning it to its initial state.
| * | | global: synchronize initialization and shutdown with pthreadsPatrick Steinhardt2016-11-011-3/+17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to initialize and tear down global data structures from different threads at once with `git_libgit2_init` and `git_libgit2_shutdown`, we race around initializing data. While we use `pthread_once` to assert that we only initilize data a single time, we actually reset the `pthread_once_t` on the last call to `git_libgit2_shutdown`. As resetting this variable is not synchronized with other threads trying to access it, this is actually racy when one thread tries to do a complete shutdown of libgit2 while another thread tries to initialize it. Fix the issue by creating a mutex which synchronizes `init_once` and the library shutdown.
* | | Merge pull request #3977 from jfultz/fix-forced-branch-creation-on-bare-repoPatrick Steinhardt2016-11-042-5/+30
|\ \ \ | |_|/ |/| |
| * | branch: fix forced branch creation on HEAD of a bare repoJohn Fultz2016-11-042-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code correctly detects that forced creation of a branch on a nonbare repo should not be able to overwrite a branch which is the HEAD reference. But there's no reason to prevent this on a bare repo, and in fact, git allows this. I.e., git branch -f master new_sha works on a bare repo with HEAD set to master. This change fixes that problem, and updates tests so that, for this case, both the bare and nonbare cases are checked for correct behavior.
* | | Merge pull request #3960 from ignatenkobrain/openssl-1.1.0Carlos Martín Nieto2016-11-022-25/+150
|\ \ \ | | | | | | | | add support for OpenSSL 1.1.0 for BIO filter
| * | | openssl: include OpenSSL headers only when we're buliding against itCarlos Martín Nieto2016-11-021-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | We need to include the initialisation and construction functions in all backend, so we include this header when building against SecureTransport and WinHTTP as well.
| * | | openssl: use ASN1_STRING_get0_data when compiling against 1.1Carlos Martín Nieto2016-11-022-2/+7
| | | | | | | | | | | | | | | | For older versions we can fall back on the deprecated ASN1_STRING_data.
| * | | openssl: recreate the OpenSSL 1.1 BIO interface for older versionsCarlos Martín Nieto2016-11-022-55/+134
| | | | | | | | | | | | | | | | | | | | We want to program against the interface, so recreate it when we compile against pre-1.1 versions.
| * | | add support for OpenSSL 1.1.0 for BIO filterIgor Gnatenko2016-10-121-0/+37
| | | | | | | | | | | | | | | | | | | | Closes: https://github.com/libgit2/libgit2/issues/3959 Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
* | | | Merge pull request #3984 from pks-t/pks/pack-find-offset-raceCarlos Martín Nieto2016-11-021-5/+5
|\ \ \ \ | | | | | | | | | | pack: fix race in pack_entry_find_offset
| * | | | pack: fix race in pack_entry_find_offsetPatrick Steinhardt2016-11-021-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `pack_entry_find_offset`, we try to find the offset of a certain object in the pack file. To do so, we first assert if the packfile has already been opened and open it if not. Opening the packfile is guarded with a mutex, so concurrent access to this is in fact safe. What is not thread-safe though is our calculation of offsets inside the packfile. Assume two threads calling `pack_entry_find_offset` at the same time. We first calculate the offset and index location and only then determine if the pack has already been opened. If so, we re-calculate the offset and index address. Now the case for two threads: thread 1 first calculates the addresses and is subsequently suspended. The second thread will now call `pack_index_open` and initialize the pack file, calculating its addresses correctly. When the first thread is resumed now, he'll see that the pack file has already been initialized and will happily proceed with the addresses it has already calculated before the check. As the pack file was not initialized before, these addresses are bogus. Fix the issue by only calculating the addresses after having checked if the pack file is open.
* | | | Merge pull request #3976 from pks-t/pks/pqueue-null-derefPatrick Steinhardt2016-11-022-2/+25
|\ \ \ \ | |_|_|/ |/| | | pqueue: resolve possible NULL pointer dereference
| * | | pqueue: resolve possible NULL pointer dereferencePatrick Steinhardt2016-10-282-2/+25
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `git_pqueue` struct allows being fixed in its total number of entries. In this case, we simply throw away items that are inserted into the priority queue by examining wether the new item to be inserted has a higher priority than the previous smallest one. This feature somewhat contradicts our pqueue implementation in that it is allowed to not have a comparison function. In fact, we also fail to check if the comparison function is actually set in the case where we add a new item into a fully filled fixed-size pqueue. As we cannot determine which item is the smallest item in absence of a comparison function, we fix the `NULL` pointer dereference by simply dropping all new items which are about to be inserted into a full fixed-size pqueue.
* | | Merge pull request #3975 from pks-t/pks/ci-improvementsCarlos Martín Nieto2016-11-012-11/+7
|\ \ \ | | | | | | | | CI Improvements
| * | | travis: do not allow valgrind failuresPatrick Steinhardt2016-10-311-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our valgrind jobs haven't been failing for several builds by now. This indicates that our tests are sufficiently stable when running under valgrind. As such, any failures reported by valgrind become interesting to us and shouldn't be ignored when causing a build to fail. Remove the valgrind job from the list of allowed failures.
| * | | coverity: check for Coverity token only if necessaryPatrick Steinhardt2016-10-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running a Coverity build, we have to provide an authentication token in order to proof that we are actually allowed to run analysis in the name of a certain project. As this token should be secret, it is only set on the main repository, so when we were requested to run the Coverity script on another repository we do error out. But in fact we do also error out if the Coverity analysis should _not_ be run if there is no authentication token provided. Fix the issue by only checking for the authentication token after determining if analysis is indeed requested.
| * | | coverity: only analyze the master branch of the main repositoryPatrick Steinhardt2016-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to only execute Coverity analysis on the 'development' branch before commit 998f001 (Refine build limitation, 2014-01-15), which refined Coverity build limitations. While we do not really use the 'development' branch anymore, it does still make sense to only analyze a single branch, as otherwise Coverity might get confused. Re-establish the restriction such that we only analyze libgit2's 'master' branch. Also fix the message announcing why we do not actually analyze a certain build.
| * | | coverity: fix download URLPatrick Steinhardt2016-10-281-2/+1
| |/ /
* | | Merge pull request #3978 from pks-t/pks/doc-improvementsEdward Thomson2016-10-313-7/+7
|\ \ \ | |/ / |/| | Small documentation improvements
| * | openssl_stream: fix typoPatrick Steinhardt2016-10-311-1/+1
| | |
| * | PROJECTS: consistently quote directoriesPatrick Steinhardt2016-10-311-3/+3
| | |
| * | Documentation: fix small typosPatrick Steinhardt2016-10-312-3/+3
|/ /
* | Merge pull request #3973 from pks-t/pks/memleak-fixesPatrick Steinhardt2016-10-282-0/+4
|\ \ | | | | | | Trivial memory leak fixes in test suite
| * | tests: fetchhead: fix memory leakPatrick Steinhardt2016-10-271-0/+2
| | |
| * | tests: vector: fix memory leakPatrick Steinhardt2016-10-271-0/+2
|/ /
* | Merge pull request #3966 from vivaladav/documentation-fixesCarlos Martín Nieto2016-10-161-1/+1
|\ \ | |/ |/| patch: minor documentation fix.
| * patch: minor documentation fix.Davide Coppola2016-10-161-1/+1
|/ | | | Fix @return description of git_patch_num_lines_in_hunk.