Merge "media.c2 client: fix # of queried param count" into main

        return C2_CORRUPTED;

    }

    size_t i = 0;

    size_t numUpdatedStackParams = 0;

    size_t numQueried = 0;

    for (auto it = paramPointers.begin(); it != paramPointers.end(); ) {

        C2Param* paramPointer = *it;

        if (numStackIndices > 0) {

                continue;

            }

            if (stackParams[i++]->updateFrom(*paramPointer)) {

                ++numUpdatedStackParams;

                ++numQueried;

            } else {

                LOG(WARNING) << "query -- param update failed: "

                                "index = "

                                "unexpected extra stack param.";

            } else {

                heapParams->emplace_back(C2Param::Copy(*paramPointer));

                ++numQueried;

            }

        }

        ++it;

    }

    size_t numQueried = numUpdatedStackParams;

    if (heapParams) {

        numQueried += heapParams->size();

    }

    if (status == C2_OK && indices.size() != numQueried) {

        status = C2_BAD_INDEX;

    }