{"thread":{"id":"19846","subject":"[JGIT PATCH] Don't NPE in server code if a symbolic reference is incomplete","startedAt":"2009-06-18T02:12:00Z","lastAt":"2009-06-18T02:12:00Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"116518","messageId":"1245291120-16688-1-git-send-email-spearce@spearce.org","threadId":"19846","inReplyTo":null,"subject":"[JGIT PATCH] Don't NPE in server code if a symbolic reference is incomplete","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-06-18T02:12:00Z","receivedAt":"2009-06-18T02:12:00Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"If a symbolic reference's target doesn't exist, then we still get the\nRef instance back from the database but its ObjectId is null.  Instead\nof trying to advertise null as a SHA-1 to the client, skip it and say\nnothing about that ref.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n .../org/spearce/jgit/transport/ReceivePack.java    |   45 +++++++++++---------\n .../src/org/spearce/jgit/transport/UploadPack.java |    2 +\n 2 files changed, 27 insertions(+), 20 deletions(-)\n\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java\nindex abaf876..c92a903 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java\n@@ -461,34 +461,39 @@ private void sendAdvertisedRefs() throws IOException {\n \t\tfinal StringBuilder m = new StringBuilder(100);\n \t\tfinal char[] idtmp = new char[2 * Constants.OBJECT_ID_LENGTH];\n \t\tfinal Iterator<Ref> i = RefComparator.sort(refs.values()).iterator();\n-\t\t{\n-\t\t\tif (i.hasNext()) {\n-\t\t\t\tfinal Ref r = i.next();\n-\t\t\t\tformat(m, idtmp, r.getObjectId(), r.getOrigName());\n-\t\t\t} else {\n-\t\t\t\tformat(m, idtmp, ObjectId.zeroId(), \"capabilities^{}\");\n-\t\t\t}\n-\t\t\tm.append('\\0');\n-\t\t\tm.append(' ');\n-\t\t\tm.append(CAPABILITY_DELETE_REFS);\n-\t\t\tm.append(' ');\n-\t\t\tm.append(CAPABILITY_REPORT_STATUS);\n-\t\t\tif (allowOfsDelta) {\n-\t\t\t\tm.append(' ');\n-\t\t\t\tm.append(CAPABILITY_OFS_DELTA);\n-\t\t\t}\n-\t\t\tm.append(' ');\n-\t\t\twriteAdvertisedRef(m);\n-\t\t}\n-\n+\t\tboolean first = true;\n \t\twhile (i.hasNext()) {\n \t\t\tfinal Ref r = i.next();\n+\t\t\tif (r.getObjectId() == null)\n+\t\t\t\tcontinue;\n \t\t\tformat(m, idtmp, r.getObjectId(), r.getOrigName());\n+\t\t\tif (first) {\n+\t\t\t\tfirst = false;\n+\t\t\t\tadvertiseCapabilities(m);\n+\t\t\t}\n+\t\t\twriteAdvertisedRef(m);\n+\t\t}\n+\t\tif (first) {\n+\t\t\tformat(m, idtmp, ObjectId.zeroId(), \"capabilities^{}\");\n+\t\t\tadvertiseCapabilities(m);\n \t\t\twriteAdvertisedRef(m);\n \t\t}\n \t\tpckOut.end();\n \t}\n \n+\tprivate void advertiseCapabilities(final StringBuilder m) {\n+\t\tm.append('\\0');\n+\t\tm.append(' ');\n+\t\tm.append(CAPABILITY_DELETE_REFS);\n+\t\tm.append(' ');\n+\t\tm.append(CAPABILITY_REPORT_STATUS);\n+\t\tif (allowOfsDelta) {\n+\t\t\tm.append(' ');\n+\t\t\tm.append(CAPABILITY_OFS_DELTA);\n+\t\t}\n+\t\tm.append(' ');\n+\t}\n+\n \tprivate void format(final StringBuilder m, final char[] idtmp,\n \t\t\tfinal ObjectId id, final String name) {\n \t\tm.setLength(0);\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java\nindex 159bd10..7d17b2d 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java\n@@ -235,6 +235,8 @@ private void sendAdvertisedRefs() throws IOException {\n \t\t}\n \t\twhile (i.hasNext()) {\n \t\t\tfinal Ref r = i.next();\n+\t\t\tif (r.getObjectId() == null)\n+\t\t\t\tcontinue;\n \t\t\tfinal RevObject o = safeParseAny(r.getObjectId());\n \t\t\tif (o != null) {\n \t\t\t\tadvertise(m, idtmp, o, r.getOrigName());\n-- \n1.6.3.2.406.gd6a466\n"}]}