)]}'
{
  "commit": "c7cddc1a2f365e4f4aea71b700c0b833eb436fee",
  "tree": "bef2c12a4203ddd03aa27def6bc1fe8fefc8e451",
  "parents": [
    "915308b187bdaba9ad1c6c3dea7b2b4b200b4796"
  ],
  "author": {
    "name": "René Scharfe",
    "email": "rene.scharfe@lsrfire.ath.cx",
    "time": "Sat Jan 31 15:39:10 2009 +0100"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sat Jan 31 10:39:55 2009 -0800"
  },
  "message": "merge: fix out-of-bounds memory access\n\nThe parameter n of unpack_callback() can have a value of up to\nMAX_UNPACK_TREES.  The check at the top of unpack_trees() (its only\n(indirect) caller) makes sure it cannot exceed this limit.\n\nunpack_callback() passes it and the array src to unpack_nondirectories(),\nwhich has this loop:\n\n\tfor (i \u003d 0; i \u003c n; i++) {\n\t\t/* ... */\n\t\tsrc[i + o-\u003emerge] \u003d o-\u003edf_conflict_entry;\n\no-\u003emerge can be 0 or 1, so unpack_nondirectories() potentially accesses\nthe array src at index MAX_UNPACK_TREES.  This patch makes it big enough.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: René Scharfe \u003crene.scharfe@lsrfire.ath.cx\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "54f301da67be879c80426bc21776427fdd38c02e",
      "old_mode": 33188,
      "old_path": "unpack-trees.c",
      "new_id": "4229eec1235842cf3432e4d5707b0e75845708b1",
      "new_mode": 33188,
      "new_path": "unpack-trees.c"
    }
  ]
}
