summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeremy Condra <gcondra@google.com>2014-04-09 04:24:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-09 04:24:51 +0000
commit26c0811923687128093202bf219e554c8ba31e2b (patch)
treeb455892114905e49db2085985fdb1a76921b8caa
parent50ac04caf96aedb31e9a93d02d50805cd3702272 (diff)
parentf36f1d5487401f5478786a1e1ef051c6aaa90098 (diff)
downloadsyspatch-26c0811923687128093202bf219e554c8ba31e2b.tar.gz
Merge "Don't increment the window count for 0-length windows."
-rw-r--r--syspatch.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/syspatch.c b/syspatch.c
index c01c6a0..3d89e6a 100644
--- a/syspatch.c
+++ b/syspatch.c
@@ -196,11 +196,13 @@ static int stream_to_target_write(xd3_stream *stream, TargetWrite *tgt) {
static int advance_target_buffer(xd3_stream *stream, MapState *target_state) {
TargetWrite *tgt = WRITE_QUEUE[TARGET_WINDOWS_WRITTEN % WRITE_QUEUE_LENGTH];
- if (write_target(tgt, target_state) != 0)
- return -1;
+ if (tgt->length) {
+ if (write_target(tgt, target_state) != 0)
+ return -1;
+ TARGET_WINDOWS_WRITTEN += 1;
+ }
if (stream_to_target_write(stream, tgt) != 0)
return -1;
- TARGET_WINDOWS_WRITTEN += 1;
return 0;
}